Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect return for WorldServer#addAllEntitiesSafely

Browse Source
This commit is contained in:
William Blake Galbreath
2020-08-15 09:38:44 -05:00
parent d7dca8c671
commit eabe82575d
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0128-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch Normal file
View File

@@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 15 Aug 2020 09:19:56 -0500
Subject: [PATCH] Fix incorrect return for WorldServer#addAllEntitiesSafely
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5e4ccb0663..3c159c6fa7 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1712,7 +1712,10 @@ public class WorldServer extends World implements GeneratorAccessSeed {
if (entity.co().anyMatch(this::isUUIDTaken)) {
return false;
} else {
- return this.addAllEntities(entity, reason); // CraftBukkit
+ // Purpur start - this MUST return true if UUID is not taken regardless if actually spawned or not
+ this.addAllEntities(entity, reason); // CraftBukkit
+ return true;
+ // Purpur end
}
}