diff --git a/CraftBukkit-Patches/0011-Spigot-Timings.patch b/CraftBukkit-Patches/0011-Spigot-Timings.patch
index c30816df7a..57d5905717 100644
--- a/CraftBukkit-Patches/0011-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0011-Spigot-Timings.patch
@@ -1,4 +1,4 @@
-From 187e5343b0d97c46388471e990f21131812b78d3 Mon Sep 17 00:00:00 2001
+From 0784a5cd4f1442f8e9f0627010215946b9832ac4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -106,7 +106,7 @@ index 706d976..206e3aa 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 187d2f4..14d2207 100644
+index 7240af0..da295f3 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -20,6 +20,7 @@ import java.io.PrintStream;
@@ -125,7 +125,7 @@ index 187d2f4..14d2207 100644
          while (!this.l.isEmpty()) {
              ServerCommand servercommand = (ServerCommand) this.l.remove(0);
  
-@@ -381,6 +383,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -382,6 +384,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              // CraftBukkit end
          }
  
@@ -134,7 +134,7 @@ index 187d2f4..14d2207 100644
  
      public boolean ae() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d909705..7dacbd5 100644
+index 914e3f3..dd1005a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -16,6 +16,7 @@ import org.bukkit.entity.Hanging;
@@ -145,16 +145,16 @@ index d909705..7dacbd5 100644
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.painting.PaintingBreakByEntityEvent;
-@@ -114,6 +115,8 @@ public abstract class Entity implements ICommandListener {
-     public boolean valid; // CraftBukkit
+@@ -115,6 +116,8 @@ public abstract class Entity implements ICommandListener {
      public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
+     public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
  
 +    public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
 +
      public int getId() {
          return this.id;
      }
-@@ -380,6 +383,7 @@ public abstract class Entity implements ICommandListener {
+@@ -381,6 +384,7 @@ public abstract class Entity implements ICommandListener {
      }
  
      public void move(double d0, double d1, double d2) {
@@ -162,7 +162,7 @@ index d909705..7dacbd5 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().c(d0, d1, d2));
              this.recalcPosition();
-@@ -716,6 +720,7 @@ public abstract class Entity implements ICommandListener {
+@@ -717,6 +721,7 @@ public abstract class Entity implements ICommandListener {
  
              this.world.methodProfiler.b();
          }
@@ -171,7 +171,7 @@ index d909705..7dacbd5 100644
  
      private void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8125cb9..6ef9c83 100644
+index 360d2ee..b8920fd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -23,6 +23,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
@@ -183,7 +183,7 @@ index 8125cb9..6ef9c83 100644
  public abstract class EntityLiving extends Entity {
  
      private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
-@@ -1434,6 +1436,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1435,6 +1437,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void t_() {
@@ -191,7 +191,7 @@ index 8125cb9..6ef9c83 100644
          super.t_();
          if (!this.world.isClientSide) {
              int i = this.bv();
-@@ -1472,7 +1475,9 @@ public abstract class EntityLiving extends Entity {
+@@ -1473,7 +1476,9 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
@@ -201,7 +201,7 @@ index 8125cb9..6ef9c83 100644
          double d0 = this.locX - this.lastX;
          double d1 = this.locZ - this.lastZ;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -1537,6 +1542,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1538,6 +1543,7 @@ public abstract class EntityLiving extends Entity {
  
          this.world.methodProfiler.b();
          this.aT += f2;
@@ -209,7 +209,7 @@ index 8125cb9..6ef9c83 100644
      }
  
      protected float h(float f, float f1) {
-@@ -1601,6 +1607,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1602,6 +1608,7 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.world.methodProfiler.a("ai");
@@ -217,7 +217,7 @@ index 8125cb9..6ef9c83 100644
          if (this.bD()) {
              this.aY = false;
              this.aZ = 0.0F;
-@@ -1611,6 +1618,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1612,6 +1619,7 @@ public abstract class EntityLiving extends Entity {
              this.doTick();
              this.world.methodProfiler.b();
          }
@@ -225,7 +225,7 @@ index 8125cb9..6ef9c83 100644
  
          this.world.methodProfiler.b();
          this.world.methodProfiler.a("jump");
-@@ -1632,11 +1640,15 @@ public abstract class EntityLiving extends Entity {
+@@ -1633,11 +1641,15 @@ public abstract class EntityLiving extends Entity {
          this.aZ *= 0.98F;
          this.ba *= 0.98F;
          this.bb *= 0.9F;
diff --git a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch
index d26342b252..235cb592e4 100644
--- a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From b1be2851e85a70cddcbe318260b04705bedc5b04 Mon Sep 17 00:00:00 2001
+From 5241276f74e49fc7d3c71cdfce4910076885633d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
 This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index db6c73b..a5707c3 100644
+index dd1005a..2f386ac 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -89,14 +89,14 @@ public abstract class Entity implements ICommandListener {
@@ -29,9 +29,9 @@ index db6c73b..a5707c3 100644
      public int ae;
      public int af;
      public int ag;
-@@ -115,7 +115,13 @@ public abstract class Entity implements ICommandListener {
-     public boolean valid; // CraftBukkit
+@@ -116,7 +116,13 @@ public abstract class Entity implements ICommandListener {
      public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
+     public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
  
 +    // Spigot start
      public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@@ -43,7 +43,7 @@ index db6c73b..a5707c3 100644
  
      public int getId() {
          return this.id;
-@@ -145,7 +151,12 @@ public abstract class Entity implements ICommandListener {
+@@ -146,7 +152,12 @@ public abstract class Entity implements ICommandListener {
          this.setPosition(0.0D, 0.0D, 0.0D);
          if (world != null) {
              this.dimension = world.worldProvider.getDimension();
@@ -178,7 +178,7 @@ index 8b7cd86..fe9a000 100644
          // Spigot start
          double radius = world.spigotConfig.itemMerge;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6ef9c83..e3a9e44 100644
+index b8920fd..bd30895 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -89,6 +89,13 @@ public abstract class EntityLiving extends Entity {
@@ -547,5 +547,5 @@ index a85800d..da8563b 100644
 +    }
  }
 -- 
-1.9.1
+2.1.4
 
diff --git a/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch
index 34c4caf648..6969d336e0 100644
--- a/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch
@@ -1,14 +1,14 @@
-From d96b140e92e6d1b05ebbcd1fbb6fbd1a2ddb3b7e Mon Sep 17 00:00:00 2001
+From b6dc057e61c507292b951a417232c665734cbe0b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 687fb4b..c14ff55 100644
+index 2f386ac..bf3ce15 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1540,6 +1540,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1541,6 +1541,7 @@ public abstract class Entity implements ICommandListener {
                      }
                  }
                  // CraftBukkit end
@@ -16,7 +16,7 @@ index 687fb4b..c14ff55 100644
                  this.setPositionRotation(this.vehicle.locX, this.vehicle.getBoundingBox().b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
                  this.vehicle.passenger = null;
              }
-@@ -1574,6 +1575,18 @@ public abstract class Entity implements ICommandListener {
+@@ -1575,6 +1576,18 @@ public abstract class Entity implements ICommandListener {
                  }
              }
              // CraftBukkit end
diff --git a/CraftBukkit-Patches/0036-Player-Collision-API.patch b/CraftBukkit-Patches/0036-Player-Collision-API.patch
index 90deae72b3..0ee84ae0bd 100644
--- a/CraftBukkit-Patches/0036-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0036-Player-Collision-API.patch
@@ -1,11 +1,11 @@
-From 535c7a565c4c81ed880b0a5d3dbdbeb8108c29bb Mon Sep 17 00:00:00 2001
+From 3fe39dbb7f7395a69b32f2a1055eadd08f930f3a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index cbb03bb..c93a5da 100644
+index ab4373a..f571649 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -427,6 +427,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -25,10 +25,10 @@ index cbb03bb..c93a5da 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e3a9e44..6a0b22a 100644
+index bd30895..6d1a743 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1674,7 +1674,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1675,7 +1675,7 @@ public abstract class EntityLiving extends Entity {
              }
          }));
  
@@ -38,7 +38,7 @@ index e3a9e44..6a0b22a 100644
                  Entity entity = (Entity) list.get(i);
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e707dd7..b0681cf 100644
+index a7a0516..4a415f6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/CraftBukkit-Patches/0052-Orebfuscator.patch b/CraftBukkit-Patches/0052-Orebfuscator.patch
index 5c2c7da6c0..a83ac8cbbf 100644
--- a/CraftBukkit-Patches/0052-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0052-Orebfuscator.patch
@@ -1,4 +1,4 @@
-From 9d67459b7d193647f8bfef3666e5543e3265a6d9 Mon Sep 17 00:00:00 2001
+From e298bca4fcf0fbf6cf2f63ca2b43e4815b72bce5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@@ -25,10 +25,10 @@ index 9e0d5ad..ce91553 100644
                                  if (block instanceof BlockFalling) {
                                      ((BlockFalling) block).a_(this.world, blockposition);
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 1ca7e3a..bc4eecb 100644
+index 23f852e..c41b911 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
-@@ -210,6 +210,7 @@ public class Explosion {
+@@ -211,6 +211,7 @@ public class Explosion {
                  blockposition = (BlockPosition) iterator.next();
                  Block block = this.world.getType(blockposition).getBlock();
  
diff --git a/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch
index 3763eb0184..21efc5380a 100644
--- a/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch
+++ b/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch
@@ -1,14 +1,14 @@
-From 2e302232b2732d65787de85d660ab7c123c11b4e Mon Sep 17 00:00:00 2001
+From 2952e571862ec9c07862a9bab3409cad2493f4ea Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c14ff55..f42707e 100644
+index bf3ce15..b96c6d6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1191,6 +1191,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1192,6 +1192,7 @@ public abstract class Entity implements ICommandListener {
              nbttagcompound.setLong("WorldUUIDLeast", this.world.getDataManager().getUUID().getLeastSignificantBits());
              nbttagcompound.setLong("WorldUUIDMost", this.world.getDataManager().getUUID().getMostSignificantBits());
              nbttagcompound.setInt("Bukkit.updateLevel", CURRENT_LEVEL);
@@ -16,7 +16,7 @@ index c14ff55..f42707e 100644
              // CraftBukkit end
              if (this.getCustomName() != null && this.getCustomName().length() > 0) {
                  nbttagcompound.setString("CustomName", this.getCustomName());
-@@ -1282,6 +1283,8 @@ public abstract class Entity implements ICommandListener {
+@@ -1283,6 +1284,8 @@ public abstract class Entity implements ICommandListener {
              if (this instanceof EntityLiving) {
                  EntityLiving entity = (EntityLiving) this;
  
diff --git a/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
index cb7c291514..7884f679ca 100644
--- a/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
+++ b/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
@@ -1,14 +1,14 @@
-From 2f777535f60f27652de59adf4ccdd7a57a201c5f Mon Sep 17 00:00:00 2001
+From 3f74786e9e903c56de3e8cde33ae1a7bf1f14707 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f42707e..047d882 100644
+index b96c6d6..027b1f1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -120,6 +120,7 @@ public abstract class Entity implements ICommandListener {
+@@ -121,6 +121,7 @@ public abstract class Entity implements ICommandListener {
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
@@ -17,7 +17,7 @@ index f42707e..047d882 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index ef3ebc4..f8aec29 100644
+index 0608c3f..a8a327d 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -457,6 +457,12 @@ public abstract class EntityInsentient extends EntityLiving {
diff --git a/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch
index f66cc78a98..98f7101547 100644
--- a/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch
+++ b/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From e7bb322d4f07f7cfa1c661df2872171e9e237c2a Mon Sep 17 00:00:00 2001
+From 3e7278e88a5c4dcaf66e2ee6d4ed3358e761bab9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 31 Jan 2014 11:18:34 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -7,10 +7,10 @@ Limit a single entity to colliding a max of configurable times per tick.
 This will alleviate issues where living entities are hoarded in 1x1 pens.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 047d882..7e87687 100644
+index 027b1f1..e69b028 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1052,6 +1052,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1053,6 +1053,7 @@ public abstract class Entity implements ICommandListener {
  
      public void d(EntityHuman entityhuman) {}
  
@@ -19,10 +19,10 @@ index 047d882..7e87687 100644
          if (entity.passenger != this && entity.vehicle != this) {
              if (!entity.noclip && !this.noclip) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6a0b22a..8090a0c 100644
+index 6d1a743..3c852fd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1675,7 +1675,9 @@ public abstract class EntityLiving extends Entity {
+@@ -1676,7 +1676,9 @@ public abstract class EntityLiving extends Entity {
          }));
  
          if (this.ad() && !list.isEmpty()) { // Spigot: Add this.ad() condition
@@ -32,7 +32,7 @@ index 6a0b22a..8090a0c 100644
                  Entity entity = (Entity) list.get(i);
  
                  // TODO better check now?
-@@ -1685,8 +1687,11 @@ public abstract class EntityLiving extends Entity {
+@@ -1686,8 +1688,11 @@ public abstract class EntityLiving extends Entity {
                  }
                  // CraftBukkit end
  
diff --git a/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch
index 3b716529cf..dd955f00ff 100644
--- a/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch
+++ b/CraftBukkit-Patches/0093-Descriptive-kick-reasons-instead-of-Nope.patch
@@ -1,14 +1,14 @@
-From d6985d4bcd68995d804d36c448da61e53740b992 Mon Sep 17 00:00:00 2001
+From c75caf0ce356def2a5a6c59ec372b6942f936d56 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 15 Mar 2014 01:30:05 -0400
 Subject: [PATCH] Descriptive kick reasons instead of Nope!
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7e87687..1c053c5 100644
+index e69b028..e345dd7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -209,7 +209,7 @@ public abstract class Entity implements ICommandListener {
+@@ -210,7 +210,7 @@ public abstract class Entity implements ICommandListener {
          if (f == Float.POSITIVE_INFINITY || f == Float.NEGATIVE_INFINITY) {
              if (this instanceof EntityPlayer) {
                  this.world.getServer().getLogger().warning(this.getName() + " was caught trying to crash the server with an invalid yaw");
@@ -17,7 +17,7 @@ index 7e87687..1c053c5 100644
              }
              f = 0;
          }
-@@ -222,7 +222,7 @@ public abstract class Entity implements ICommandListener {
+@@ -223,7 +223,7 @@ public abstract class Entity implements ICommandListener {
          if (f1 == Float.POSITIVE_INFINITY || f1 == Float.NEGATIVE_INFINITY) {
              if (this instanceof EntityPlayer) {
                  this.world.getServer().getLogger().warning(this.getName() + " was caught trying to crash the server with an invalid pitch");
diff --git a/CraftBukkit-Patches/0097-Add-Conversion-Message.patch b/CraftBukkit-Patches/0097-Add-Conversion-Message.patch
index 07a896a8bf..b12b9de023 100644
--- a/CraftBukkit-Patches/0097-Add-Conversion-Message.patch
+++ b/CraftBukkit-Patches/0097-Add-Conversion-Message.patch
@@ -1,14 +1,14 @@
-From 3b149e430a4eb04fe8a283087d0bbc1d579ccc48 Mon Sep 17 00:00:00 2001
+From 868ed7873d461685203a175e5c07e1c268a52387 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 23:30:44 +1000
 Subject: [PATCH] Add Conversion Message
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 6331317..37b5728 100644
+index 9febc99..2bcc81f 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -523,6 +523,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -524,6 +524,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
      }
  
      protected boolean aR() {