More 1.14 patches

This commit is contained in:
Spottedleaf
2019-04-30 15:51:03 -07:00
parent 86e7cee50c
commit be2fdf029f
9 changed files with 179 additions and 242 deletions

View File

@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
if the entity was to end up in 2 different chunk slices
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 5d187e5d7d..01abe5e376 100644
index 8b6a52d72..0c8a2ac90 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -39,13 +39,13 @@ index 5d187e5d7d..01abe5e376 100644
if (!entity.inChunk || entity.getCurrentChunk() != this) entityCounts.increment(entity.getMinecraftKeyString()); // Paper
entity.inChunk = true;
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
entity.chunkZ = this.locZ;
entity.chunkY = k;
entity.chunkZ = this.loc.z;
this.entitySlices[k].add(entity);
// Paper start
+ entity.entitySlice = this.entitySlices[k]; // Paper
this.markDirty();
if (entity instanceof EntityItem) {
itemCounts[k]++;
this.markDirty(); // Paper
}
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
}
// Paper start
@@ -57,7 +57,7 @@ index 5d187e5d7d..01abe5e376 100644
return;
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 539273afbc..ead5af991c 100644
index 57a4481c5..4648a93b0 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 INamableTileEntity, ICommandListener, Ke