Update upstream CB/S

2017-04-10 22:11:26 -05:00
parent 965f78b3af
commit 9aba83bfdc
7 changed files with 10 additions and 10 deletions
--- a/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch
@@ -30,7 +30,7 @@ index 5f13fbff3..4b64ccaa0 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 59654bcc9..21f5df3c0 100644
+index c23bd2e9b..a9e3b632b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {