Update upstream and remove hopper patch for #1270

This commit is contained in:
Aikar
2018-07-25 01:11:08 -04:00
parent 875c84df6f
commit 5992b9f2ad
9 changed files with 12 additions and 299 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 aa75cc420..56a74c606 100644
index aa75cc4205..56a74c6062 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 {
@@ -61,7 +61,7 @@ index aa75cc420..56a74c606 100644
if (entity instanceof EntityItem) {
itemCounts[i]--;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b6d6d4f37..bc4ba9f3c 100644
index 9f2a23d693..7a63114fe5 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