Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,11 +1,11 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/PathfinderGoalPanic.java 2014-11-28 17:43:43.305707430 +0000
+++ src/main/java/net/minecraft/server/PathfinderGoalPanic.java 2014-11-28 17:38:23.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/PathfinderGoalPanic.java 2015-02-26 22:40:22.963608135 +0000
+++ src/main/java/net/minecraft/server/PathfinderGoalPanic.java 2015-02-26 22:40:22.967608135 +0000
@@ -36,6 +36,12 @@
}
public boolean b() {
+ // CraftBukkit start - introduce a temporary timeout hack until this is fixed properly
+ if ((this.b.ticksLived - this.b.bd/*getHurtTimestamp*/()) > 100) {
+ if ((this.b.ticksLived - this.b.hurtTimestamp) > 100) {
+ this.b.b((EntityLiving) null);
+ return false;
+ }