Update upstream

2018-03-25 20:06:44 -04:00
parent 90d862413b
commit 36f69d38bc
7 changed files with 9 additions and 9 deletions
--- a/Spigot-Server-Patches/Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/Toggleable-Elytra-Wall-Damage.patch
@@ -21,7 +21,7 @@ index 112c447e2..d182e716a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index edc9d94b7..f76be4da0 100644
+index 4b6bb38ae..dda6219a7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {