5d8b3d4969
Spigot had code that returned early in chunk add/remove methods. This was causing our code added to set current chunks and counts to be skipped over if the entity was default not persistent but made persistent. This was the source of many issues Fixes #1208
90 lines
4 KiB
Diff
90 lines
4 KiB
Diff
From dbe49167504d8c10b0dd8fbd271f186cf752057e 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
|
|
|
|
In many places where we simply want the current chunk the entity
|
|
is in, instead of doing a hashmap lookup for it, we now have access
|
|
to the object directly on the Entity/TileEntity object we can directly grab.
|
|
|
|
Use that local value instead to reduce lookups in many hot places.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
|
index 81bf60efa..04adf4e3c 100644
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
|
@@ -702,6 +702,7 @@ public class Chunk {
|
|
// Spigot end
|
|
}
|
|
|
|
+ public void removeEntity(Entity entity) { b(entity); } // Paper - OBFHELPER
|
|
public void b(Entity entity) {
|
|
this.a(entity, entity.ac);
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index c0816b9f8..52adee880 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1511,12 +1511,15 @@ public abstract class World implements IBlockAccess {
|
|
int j;
|
|
// Paper start - Set based removal lists
|
|
for (Entity e : this.f) {
|
|
+ /*
|
|
j = e.getChunkZ();
|
|
int k = e.getChunkX();
|
|
|
|
if (e.isAddedToChunk() && this.isChunkLoaded(k, j, true)) {
|
|
this.getChunkAt(k, j).b(e);
|
|
- }
|
|
+ }*/
|
|
+ Chunk chunk = e.isAddedToChunk() ? e.getCurrentChunk() : null;
|
|
+ if (chunk != null) chunk.removeEntity(e);
|
|
}
|
|
|
|
for (Entity e : this.f) {
|
|
@@ -1577,12 +1580,17 @@ public abstract class World implements IBlockAccess {
|
|
this.methodProfiler.b();
|
|
this.methodProfiler.a("remove");
|
|
if (entity.dead) {
|
|
+ // Paper start
|
|
+ /*
|
|
j = entity.ab;
|
|
int l = entity.ad;
|
|
|
|
- if (entity.aa && this.isChunkLoaded(j, l, true)) {
|
|
+ /*if (entity.aa && this.isChunkLoaded(j, l, true)) {
|
|
this.getChunkAt(j, l).b(entity);
|
|
- }
|
|
+ }*/
|
|
+ Chunk chunk = entity.isAddedToChunk() ? entity.getCurrentChunk() : null;
|
|
+ if (chunk != null) chunk.removeEntity(entity);
|
|
+ // Paper end
|
|
|
|
guardEntityList = false; // Spigot
|
|
this.entityList.remove(this.tickPosition--); // CraftBukkit - Use field for loop variable
|
|
@@ -1627,7 +1635,7 @@ public abstract class World implements IBlockAccess {
|
|
BlockPosition blockposition = tileentity.getPosition();
|
|
|
|
// Paper start - Skip ticking in chunks scheduled for unload
|
|
- net.minecraft.server.Chunk chunk = this.getChunkIfLoaded(blockposition);
|
|
+ net.minecraft.server.Chunk chunk = tileentity.getCurrentChunk();
|
|
boolean shouldTick = chunk != null;
|
|
if(this.paperConfig.skipEntityTickingInChunksScheduledForUnload)
|
|
shouldTick = shouldTick && !chunk.isUnloading() && chunk.scheduledForUnload == null;
|
|
@@ -1663,8 +1671,11 @@ public abstract class World implements IBlockAccess {
|
|
tilesThisCycle--;
|
|
this.tileEntityListTick.remove(tileTickPosition--);
|
|
//this.tileEntityList.remove(tileentity); // Paper - remove unused list
|
|
- if (this.isLoaded(tileentity.getPosition())) {
|
|
- this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
|
|
+ // Paper start
|
|
+ net.minecraft.server.Chunk chunk = tileentity.getCurrentChunk();
|
|
+ if (chunk != null) {
|
|
+ chunk.removeTileEntity(tileentity.getPosition());
|
|
+ // Paper end
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.18.0
|
|
|