--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalPanic.java
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalPanic.java
@@ -11,6 +11,10 @@
 import net.minecraft.world.level.IBlockAccess;
 import net.minecraft.world.phys.Vec3D;
 
+// CraftBukkit start
+import net.minecraft.world.entity.EntityLiving;
+// CraftBukkit end
+
 public class PathfinderGoalPanic extends PathfinderGoal {
 
     protected final EntityCreature mob;
@@ -76,6 +80,12 @@
 
     @Override
     public boolean b() {
+        // CraftBukkit start - introduce a temporary timeout hack until this is fixed properly
+        if ((this.mob.tickCount - this.mob.lastHurtByMobTimestamp) > 100) {
+            this.mob.setLastDamager((EntityLiving) null);
+            return false;
+        }
+        // CraftBukkit end
         return !this.mob.getNavigation().m();
     }
 
