2018-12-15 02:17:27 +01:00
From ce0e1b9fb596f82f91df77559fe845022517da42 Mon Sep 17 00:00:00 2001
2018-08-04 05:02:44 +02:00
From: Aikar <aikar@aikar.co>
Date: Fri, 3 Aug 2018 22:47:46 -0400
Subject: [PATCH] Entity add to world fixes
1) Chunk Registration might kill an entity, don't add it to the world if it did!
2) By default, entities are added to the world per slice iteration.
This opens risk of the slices being manipulated during chunk add if an
EntityAddToWorldEvent spawns an entity into this chunk.
Fix this by differing entity add to world for all entities at the same time
3) If a duplicate entity is attempted to add to the world of an entity, and
the original entity is dead, overwrite it as the logic does for unloaod queued entities.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
2018-12-15 02:17:27 +01:00
index a62d7196b..836aea6c3 100644
2018-08-04 05:02:44 +02:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
2018-10-23 01:16:21 +02:00
@@ -911,6 +911,7 @@ public class Chunk implements IChunkAccess {
2018-08-26 20:11:49 +02:00
this.world.a(this.tileEntities.values());
2018-08-04 05:02:44 +02:00
List[] aentityslice = this.entitySlices; // Spigot
int i = aentityslice.length;
+ List<Entity> toAdd = new java.util.ArrayList<>(32); // Paper
for (int j = 0; j < i; ++j) {
List entityslice = aentityslice[j]; // Spigot
2018-10-23 01:16:21 +02:00
@@ -957,12 +958,11 @@ public class Chunk implements IChunkAccess {
2018-08-04 05:02:44 +02:00
thisChunk.put(entity.uniqueID, entity);
}
}
- // Paper end
2018-08-26 20:11:49 +02:00
- this.world.a(entityslice.stream().filter((entity) -> {
- return !(entity instanceof EntityHuman);
- }));
2018-08-04 05:02:44 +02:00
+ toAdd.addAll(entityslice);
+ // Paper end
}
2018-10-07 20:58:53 +02:00
+ this.world.addChunkEntities(toAdd.stream().filter((entity) -> !(entity instanceof EntityHuman || entity.valid))); // Paper - add all at same time to avoid entities adding to world modifying slice state, skip already added entities (not normal, but can happen)
2018-08-04 05:02:44 +02:00
2018-08-04 06:33:21 +02:00
// CraftBukkit start
org.bukkit.Server server = this.world.getServer();
2018-08-04 05:02:44 +02:00
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
2018-12-15 02:17:27 +01:00
index 12379f755..72e74c59f 100644
2018-08-04 05:02:44 +02:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2018-10-07 20:58:53 +02:00
@@ -1103,6 +1103,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
2018-08-04 05:02:44 +02:00
}
this.getChunkAt(i, j).a(entity);
+ if (entity.dead) return false; // Paper - don't add dead entities, chunk registration may of killed it
this.entityList.add(entity);
this.b(entity);
return true;
2018-10-07 20:58:53 +02:00
@@ -2508,9 +2509,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
2018-08-26 20:11:49 +02:00
return j;
2018-08-04 05:02:44 +02:00
}
2018-08-26 20:11:49 +02:00
+ public void addChunkEntities(Stream<Entity> collection) { a(collection); } // Paper - OBFHELPER
public void a(Stream<Entity> stream) {
2018-08-04 05:02:44 +02:00
org.spigotmc.AsyncCatcher.catchOp( "entity world add"); // Spigot
2018-08-26 20:11:49 +02:00
stream.forEach((entity) -> {
2018-08-04 05:02:44 +02:00
+ if (entity == null || entity.dead || entity.valid) { // Paper - prevent adding already added or dead entities
2018-08-26 20:11:49 +02:00
+ return;
+ }
2018-08-04 05:02:44 +02:00
this.entityList.add(entity);
2018-08-26 20:11:49 +02:00
this.b(entity);
});
2018-08-04 05:02:44 +02:00
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
2018-12-15 02:17:27 +01:00
index 572c54c9c..0545336b4 100644
2018-08-04 05:02:44 +02:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2018-10-07 20:58:53 +02:00
@@ -990,7 +990,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
2018-08-04 05:02:44 +02:00
if (this.entitiesByUUID.containsKey(uuid)) {
Entity entity1 = (Entity) this.entitiesByUUID.get(uuid);
2018-08-04 06:33:21 +02:00
- if (this.g.contains(entity1)) {
+ if (this.g.contains(entity1) || entity1.dead) { // Paper - if dupe is dead, overwrite
this.g.remove(entity1);
2018-08-04 05:02:44 +02:00
} else {
if (!(entity instanceof EntityHuman)) {
--
2018-12-15 02:17:27 +01:00
2.20.0
2018-08-04 05:02:44 +02:00