Update Upstream

Removed my ChunkLoadEvent patch as upstream fixed it
2018-07-30 01:08:59 -04:00
parent 5fe01c2659
commit 720dabd2aa
40 changed files with 60 additions and 129 deletions
--- a/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
@@ -20,7 +20,7 @@ index 38a697e1b7..68898d624f 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5ba537bab2..f95024cba5 100644
+index 37392bdf20..e5e4437332 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