diff --git a/CraftBukkit-Patches/0017-Skip-entity.move-if-we-are-not-moving-anywhere.patch b/CraftBukkit-Patches/0017-Skip-entity.move-if-we-are-not-moving-anywhere.patch
new file mode 100644
index 0000000000..bc7d7f28a8
--- /dev/null
+++ b/CraftBukkit-Patches/0017-Skip-entity.move-if-we-are-not-moving-anywhere.patch
@@ -0,0 +1,24 @@
+From a1d4528a15bca1309e3d9ff10a465508ce910cce Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 19 Jan 2013 01:11:30 -0500
+Subject: [PATCH] Skip entity.move() if we are not moving anywhere.
+
+---
+ src/main/java/net/minecraft/server/Entity.java | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index ebe0ed0..b816334 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -419,6 +419,7 @@ public abstract class Entity {
+     }
+ 
+     public void move(double d0, double d1, double d2) {
++        if (d0 == 0 && d1 == 0 && d2 == 0) { return; } // Spigot
+         if (this.Y) {
+             this.boundingBox.d(d0, d1, d2);
+             this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
+-- 
+1.8.1-rc2
+