Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Ensure players are not marked to be removed after re-add

Browse Source
This commit is contained in:
Zach Brown 2018-07-31 16:39:15 -05:00
parent d72dce83ad
commit cc597bfd1d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/Ignore-Dead-Entities-in-entityList-iteration.patch
View File

@ -23,7 +23,7 @@ index ecd1c65a9..1898ab897 100644
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/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 89f9bd347..d163acd8f 100644
index 1e64d5fcd..45e149f4a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
@ -35,9 +35,17 @@ index 89f9bd347..d163acd8f 100644
public float length;
public float I;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index df98a4f44..8f82fbf67 100644
index 0dca11b2c..dadd4b839 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
}
entity.valid = true; // CraftBukkit
+ entity.shouldBeRemoved = false;
new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
}
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
if (entity.aa && this.isChunkLoaded(i, j, true)) {
this.getChunkAt(i, j).b(entity);