Upstream update

This commit is contained in:
Aikar
2018-08-03 01:04:28 -04:00
parent 631614f5bd
commit e966ee5aef
8 changed files with 15 additions and 58 deletions

View File

@@ -54,7 +54,7 @@ index 9f3aa24590..7dbea90902 100644
return this.c(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2));
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 411ab6061b..cd4fbee0ca 100644
index 03c96de98b..2d06202da7 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ import com.google.common.collect.Lists; // CraftBukkit
@@ -131,7 +131,7 @@ index ca2a14d7ac..9a513b4e3a 100644
private boolean c = true;
private boolean d = true;
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 0d26fc56dd..e7b5daf28e 100644
index 359979cc1c..0c54eaa529 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -0,0 +0,0 @@ import org.bukkit.TreeType;