Update CraftBukkit to Minecraft 1.5.2

This commit is contained in:
Travis Watkins
2013-04-27 04:40:05 -05:00
parent 83c3aa188b
commit 799779e4b1
53 changed files with 317 additions and 268 deletions

View File

@@ -76,7 +76,6 @@ public class EntityWolf extends EntityTameableAnimal {
}
protected boolean isTypeNotPersistent() {
// CraftBukkit - added && !this.isTamed()
return this.isAngry() && !this.isTamed();
}
@@ -114,13 +113,13 @@ public class EntityWolf extends EntityTameableAnimal {
public void l_() {
super.l_();
this.f = this.e;
if (this.bW()) {
if (this.bY()) {
this.e += (1.0F - this.e) * 0.4F;
} else {
this.e += (0.0F - this.e) * 0.4F;
}
if (this.bW()) {
if (this.bY()) {
this.bJ = 10;
}
@@ -329,7 +328,7 @@ public class EntityWolf extends EntityTameableAnimal {
}
}
public boolean bW() {
public boolean bY() {
return this.datawatcher.getByte(19) == 1;
}