2018-12-15 02:17:27 +01:00
|
|
|
From a25472bc5e97fb4bc871d21cc6f3068f9cab0489 Mon Sep 17 00:00:00 2001
|
2018-07-28 18:13:52 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 28 Jul 2018 12:09:20 -0400
|
|
|
|
Subject: [PATCH] Always process chunk removal in removeEntity
|
|
|
|
|
|
|
|
Spigot might skip chunk registration changes in removeEntity
|
|
|
|
which can keep them in the chunk when they shouldnt be if done
|
|
|
|
during entity ticking.
|
|
|
|
|
|
|
|
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 811311e9e..1d7188b2e 100644
|
2018-07-28 18:13:52 +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
|
|
|
@@ -1173,7 +1173,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
2018-07-28 18:13:52 +02:00
|
|
|
this.everyoneSleeping();
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking
|
|
|
|
+ // if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking // Paper - move down
|
2018-07-29 19:12:39 +02:00
|
|
|
int i = entity.ae;
|
|
|
|
int j = entity.ag;
|
2018-07-28 18:13:52 +02:00
|
|
|
|
2018-10-07 20:58:53 +02:00
|
|
|
@@ -1181,6 +1181,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
2018-07-28 18:13:52 +02:00
|
|
|
this.getChunkAt(i, j).b(entity);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking // Paper - always remove from current chunk above
|
|
|
|
// CraftBukkit start - Decrement loop variable field if we've already ticked this entity
|
|
|
|
int index = this.entityList.indexOf(entity);
|
|
|
|
if (index != -1) {
|
|
|
|
--
|
2018-12-15 02:17:27 +01:00
|
|
|
2.20.0
|
2018-07-28 18:13:52 +02:00
|
|
|
|