Paper/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch

133 lines
6.7 KiB
Diff
Raw Normal View History

From 78f846465f4f93cb461215ef66ff965a3bcba3ab Mon Sep 17 00:00:00 2001
2019-05-05 04:23:25 +02:00
From: Aikar <aikar@aikar.co>
Date: Sat, 28 Jul 2018 12:18:27 -0400
Subject: [PATCH] Ignore Dead Entities in entityList iteration
A spigot change delays removal of entities from the entity list.
This causes a change in behavior from Vanilla where getEntities type
methods will return dead entities that they shouldn't otherwise be doing.
This will ensure that dead entities are skipped from iteration since
they shouldn't of been in the list in the first place.
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
index b839769c..5acad8e4 100644
2019-05-05 04:23:25 +02:00
--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
@@ -179,6 +179,7 @@ public class PaperCommand extends Command {
Collection<Entity> entities = world.entitiesById.values();
entities.forEach(e -> {
2019-05-05 04:23:25 +02:00
MinecraftKey key = e.getMinecraftKey();
+ if (e.shouldBeRemoved) return; // Paper
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 8d3c265c..8d6c5d18 100644
2019-05-05 04:23:25 +02:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -796,6 +796,7 @@ public class Chunk implements IChunkAccess {
2019-05-05 04:23:25 +02:00
while (iterator.hasNext()) {
Entity entity1 = (Entity) iterator.next();
+ if (entity1.shouldBeRemoved) continue; // Paper
if (entity1.getBoundingBox().c(axisalignedbb) && entity1 != entity) {
if (predicate == null || predicate.test(entity1)) {
@@ -833,6 +834,7 @@ public class Chunk implements IChunkAccess {
2019-05-05 04:23:25 +02:00
while (iterator.hasNext()) {
T entity = (T) iterator.next(); // CraftBukkit - decompile error
2019-05-05 04:23:25 +02:00
+ if (entity.shouldBeRemoved) continue; // Paper
if ((entitytypes == null || entity.getEntityType() == entitytypes) && entity.getBoundingBox().c(axisalignedbb) && predicate.test(entity)) {
list.add(entity);
@@ -854,6 +856,7 @@ public class Chunk implements IChunkAccess {
2019-05-05 04:23:25 +02:00
while (iterator.hasNext()) {
T t0 = (T) iterator.next(); // CraftBukkit - decompile error
+ if (t0.shouldBeRemoved) continue; // Paper
if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
list.add(t0);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 356de07d..33cd7f7b 100644
2019-05-05 04:23:25 +02:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -195,6 +195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
protected int numCollisions = 0; // Paper
public void inactiveTick() { }
// Spigot end
2019-05-05 04:23:25 +02:00
+ public boolean shouldBeRemoved; // Paper
public float getBukkitYaw() {
return this.yaw;
2019-05-05 04:23:25 +02:00
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 87762b17..8d292604 100644
2019-05-05 04:23:25 +02:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -908,7 +908,7 @@ public class WorldServer extends World {
2019-05-05 04:23:25 +02:00
while (objectiterator.hasNext()) {
Entity entity = (Entity) objectiterator.next();
2019-07-20 06:01:24 +02:00
-
2019-05-05 04:23:25 +02:00
+ if (entity.shouldBeRemoved) continue; // Paper
if (entity instanceof EntityInsentient) {
EntityInsentient entityinsentient = (EntityInsentient) entity;
2019-07-20 06:01:24 +02:00
@@ -1244,6 +1244,7 @@ public class WorldServer extends World {
2019-05-05 23:39:51 +02:00
entity.origin = entity.getBukkitEntity().getLocation();
2019-05-05 04:23:25 +02:00
}
2019-05-05 23:39:51 +02:00
// Paper end
2019-05-05 04:23:25 +02:00
+ entity.shouldBeRemoved = false; // Paper - shouldn't be removed after being re-added
new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
}
@@ -1256,6 +1257,7 @@ public class WorldServer extends World {
2019-05-05 04:23:25 +02:00
this.removeEntityFromChunk(entity);
this.entitiesById.remove(entity.getId());
this.unregisterEntity(entity);
+ entity.shouldBeRemoved = true; // Paper
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 588c8711..e94ac028 100644
2019-05-05 04:23:25 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1025,6 +1025,7 @@ public class CraftWorld implements World {
2019-05-05 04:23:25 +02:00
for (Object o : world.entitiesById.values()) {
if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
+ if (mcEnt.shouldBeRemoved) continue; // Paper
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1044,6 +1045,7 @@ public class CraftWorld implements World {
2019-05-05 04:23:25 +02:00
for (Object o : world.entitiesById.values()) {
if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
+ if (mcEnt.shouldBeRemoved) continue; // Paper
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1070,6 +1072,7 @@ public class CraftWorld implements World {
2019-05-05 04:23:25 +02:00
for (Object entity: world.entitiesById.values()) {
if (entity instanceof net.minecraft.server.Entity) {
+ if (((net.minecraft.server.Entity) entity).shouldBeRemoved) continue; // Paper
Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
if (bukkitEntity == null) {
@@ -1093,6 +1096,7 @@ public class CraftWorld implements World {
2019-05-05 04:23:25 +02:00
for (Object entity: world.entitiesById.values()) {
if (entity instanceof net.minecraft.server.Entity) {
+ if (((net.minecraft.server.Entity) entity).shouldBeRemoved) continue; // Paper
Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
if (bukkitEntity == null) {
--
2.25.1.windows.1
2019-05-05 04:23:25 +02:00