Update upstream B/CB

2018-07-30 20:19:41 -05:00
parent be0ed31821
commit 452f012665
28 changed files with 98 additions and 98 deletions
--- a/Spigot-Server-Patches/Paper-config-files.patch
+++ b/Spigot-Server-Patches/Paper-config-files.patch
@@ -519,7 +519,7 @@ index 5ff1e9686..3706e44a3 100644
             DedicatedServer.LOGGER.info("Generating keypair");
             this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 34d6ad182..b8eb89240 100644
+index 55bf00be9..a1050912b 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 {