Update upstream CB

2017-07-24 06:47:43 -05:00
parent 9115bf4ca0
commit b7336e0204
13 changed files with 24 additions and 24 deletions
--- a/Spigot-Server-Patches/Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/Fix-inter-world-teleportation-glitches.patch
@@ -25,7 +25,7 @@ index 4cc74cd65..fa49397ea 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fe40c51a4..eb7bdd222 100644
+index b54da3211..7e95ec70f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {