diff --git a/nms-patches/Entity.patch b/nms-patches/Entity.patch
index 10e3d4fcfd..19a0b5379e 100644
--- a/nms-patches/Entity.patch
+++ b/nms-patches/Entity.patch
@@ -645,8 +645,8 @@
                  blockposition = worldserver1.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver1.getSpawn());
              } else if (dimensionmanager == DimensionManager.THE_END) {
 @@ -2039,6 +2393,25 @@
-                 vec3d = shapedetector_c.b;
-                 f = (float) shapedetector_c.c;
+                 vec3d = shapedetector_shape.velocity;
+                 f = (float) shapedetector_shape.yaw;
              }
 +        } // CraftBukkit
 +
diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch
index 5d3d943a13..ed3e2aaff1 100644
--- a/nms-patches/EntityHuman.patch
+++ b/nms-patches/EntityHuman.patch
@@ -450,4 +450,4 @@
 +        return true; // CraftBukkit
      }
  
-     public abstract boolean isSpectator();
+     @Override
diff --git a/nms-patches/PlayerChunkMap.patch b/nms-patches/PlayerChunkMap.patch
index c4bb4ac9c6..e33d21589f 100644
--- a/nms-patches/PlayerChunkMap.patch
+++ b/nms-patches/PlayerChunkMap.patch
@@ -114,7 +114,7 @@
 +        return nbttagcompound == null ? null : this.getChunkData(this.world.getWorldProvider().getDimensionManager(), this.m, nbttagcompound, chunkcoordintpair, world); // CraftBukkit
      }
  
-     boolean d(ChunkCoordIntPair chunkcoordintpair) {
+     boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair) {
 @@ -1052,7 +1056,7 @@
          public final Set<EntityPlayer> trackedPlayers = Sets.newHashSet();
  
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 328679fba4..c88704f69e 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -186,7 +186,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
      * @return string
      */
     public String getMappingsVersion() {
-        return "c31c513e1fa6657aacbd4facd394c5b0";
+        return "df689a0f36ee29c2b2f456da8803f74d";
     }
 
     @Override