Update upstream B/CB

2017-03-31 23:24:42 -05:00
parent bc4e080971
commit 66a6db73e0
21 changed files with 56 additions and 56 deletions
--- a/Spigot-Server-Patches/Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/Configurable-end-credits.patch
@@ -20,7 +20,7 @@ index fd606ee14..c00fa83d5 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4b9e83161..7c8c61ee8 100644
+index 030a3e51c..79c9601fa 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {