update upstream

This commit is contained in:
Aikar
2018-07-29 12:42:07 -04:00
parent 3cce0c9f1b
commit c33b679642
77 changed files with 260 additions and 273 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity and entity crashes
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 0d54513a44..d8d519143e 100644
index 0d54513a4..d8d519143 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -23,7 +23,7 @@ index 0d54513a44..d8d519143e 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e3c56a7506..bfe09a2055 100644
index 6bb52c7d4..ada8376e8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose