Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.4.7

Browse Source
This commit is contained in:
feildmaster
2013-01-17 03:28:44 -06:00
parent 315127782a
commit e59af9908b
36 changed files with 83 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minecraft/server/EntityWolf.java
View File

@@ -35,8 +35,8 @@ public class EntityWolf extends EntityTameableAnimal {
return true;
}
public void b(EntityLiving entityliving) {
super.b(entityliving);
public void setGoalTarget(EntityLiving entityliving) {
super.setGoalTarget(entityliving);
if (entityliving instanceof EntityHuman) {
this.setAngry(true);
}
@@ -75,7 +75,7 @@ public class EntityWolf extends EntityTameableAnimal {
}
}
protected boolean bj() {
protected boolean isTypeNotPersistent() {
// CraftBukkit - added && !this.isTamed()
return this.isAngry() && !this.isTamed();
}
@@ -171,7 +171,7 @@ public class EntityWolf extends EntityTameableAnimal {
} else {
Entity entity = damagesource.getEntity();
this.d.a(false);
this.d.setSitting(false);
if (entity != null && !(entity instanceof EntityHuman) && !(entity instanceof EntityArrow)) {
i = (i + 1) / 2;
}
@@ -221,7 +221,7 @@ public class EntityWolf extends EntityTameableAnimal {
}
if (entityhuman.name.equalsIgnoreCase(this.getOwnerName()) && !this.world.isStatic && !this.c(itemstack)) {
this.d.a(!this.isSitting());
this.d.setSitting(!this.isSitting());
this.bF = false;
this.setPathEntity((PathEntity) null);
}
@@ -240,8 +240,8 @@ public class EntityWolf extends EntityTameableAnimal {
boolean updateMaxHealth = this.getMaxHealth() == this.maxHealth; // CraftBukkit
this.setTamed(true);
this.setPathEntity((PathEntity) null);
this.b((EntityLiving) null);
this.d.a(true);
this.setGoalTarget((EntityLiving) null);
this.d.setSitting(true);
// CraftBukkit start
if (updateMaxHealth) {
this.maxHealth = this.getMaxHealth();