1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalPanic.java b/src/main/java/net/minecraft/server/PathfinderGoalPanic.java
index d58911e4..cbf1976c 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalPanic.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalPanic.java
@@ -36,6 +36,12 @@ public class PathfinderGoalPanic extends PathfinderGoal {
     }
 
     public boolean b() {
+        // CraftBukkit start - introduce a temporary timeout hack until this is fixed properly
+        if ((this.a.ticksLived - this.a.aE()) > 100) {
+            this.a.b((EntityLiving) null);
+            return false;
+        }
+        // CraftBukkit end
         return !this.a.getNavigation().g();
     }
 }