Rebuild patches for upstream merge

2018-07-21 16:43:00 -04:00
parent 7c13469d6c
commit 1b778924c3
17 changed files with 52 additions and 59 deletions
--- a/Spigot-Server-Patches/Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/Optional-TNT-doesn-t-move-in-water.patch
@@ -32,7 +32,7 @@ index 38de48ebc..321da3be3 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 70694c8e5..51b42933d 100644
+index dd4ac4bfe..34c617958 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