From cf1735378386422c6ff659855706c4ae8bedbdbc Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 7 May 2019 06:50:02 -0700 Subject: [PATCH] Fix tracking dead entities --- ...oid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0249-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0249-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch index ff539fa6a..8365341e8 100644 --- a/Spigot-Server-Patches/0249-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch +++ b/Spigot-Server-Patches/0249-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch @@ -1,4 +1,4 @@ -From ff03c56abf16576c896a802b68df985d5145ba59 Mon Sep 17 00:00:00 2001 +From f9d1477d080f592e85e7279932c397dba374cb13 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 03:39:51 -0400 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk @@ -45,7 +45,7 @@ index edd8e7810f..5349a3a8bc 100644 chunk.setTileEntity(tileentity1.getPosition(), tileentity1); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 38d673d8fe..bb2059fda7 100644 +index 38d673d8fe..902aa562cc 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1068,7 +1068,7 @@ public class WorldServer extends World { @@ -53,7 +53,7 @@ index 38d673d8fe..bb2059fda7 100644 this.entitiesByUUID.remove(entity.getUniqueID()); - this.getChunkProvider().removeEntity(entity); -+ if (entity.getCurrentChunk() != null ) this.getChunkProvider().removeEntity(entity); // Paper ++ this.getChunkProvider().removeEntity(entity); // Paper if (entity instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) entity;