Fix tracking dead entities

This commit is contained in:
Spottedleaf 2019-05-07 06:50:02 -07:00
parent 725cf24308
commit cf17353783

View File

@ -1,4 +1,4 @@
From ff03c56abf16576c896a802b68df985d5145ba59 Mon Sep 17 00:00:00 2001
From f9d1477d080f592e85e7279932c397dba374cb13 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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;