Update CraftBukkit to Minecraft 1.4.6

This commit is contained in:
feildmaster
2012-12-19 22:03:52 -06:00
parent 9f1bf124ee
commit 23b6764374
115 changed files with 1930 additions and 1426 deletions

View File

@@ -11,15 +11,15 @@ public class EntityZombie extends EntityMonster {
public EntityZombie(World world) {
super(world);
this.texture = "/mob/zombie.png";
this.bG = 0.23F;
this.bH = 0.23F;
this.getNavigation().b(true);
this.goalSelector.a(0, new PathfinderGoalFloat(this));
this.goalSelector.a(1, new PathfinderGoalBreakDoor(this));
this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, EntityHuman.class, this.bG, false));
this.goalSelector.a(3, new PathfinderGoalMeleeAttack(this, EntityVillager.class, this.bG, true));
this.goalSelector.a(4, new PathfinderGoalMoveTowardsRestriction(this, this.bG));
this.goalSelector.a(5, new PathfinderGoalMoveThroughVillage(this, this.bG, false));
this.goalSelector.a(6, new PathfinderGoalRandomStroll(this, this.bG));
this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, EntityHuman.class, this.bH, false));
this.goalSelector.a(3, new PathfinderGoalMeleeAttack(this, EntityVillager.class, this.bH, true));
this.goalSelector.a(4, new PathfinderGoalMoveTowardsRestriction(this, this.bH));
this.goalSelector.a(5, new PathfinderGoalMoveThroughVillage(this, this.bH, false));
this.goalSelector.a(6, new PathfinderGoalRandomStroll(this, this.bH));
this.goalSelector.a(7, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
this.goalSelector.a(7, new PathfinderGoalRandomLookaround(this));
this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this, false));
@@ -235,7 +235,7 @@ public class EntityZombie extends EntityMonster {
}
public void bG() {
this.canPickUpLoot = this.random.nextFloat() < as[this.world.difficulty];
this.canPickUpLoot = this.random.nextFloat() < at[this.world.difficulty];
if (this.world.random.nextFloat() < 0.05F) {
this.setVillager(true);
}
@@ -253,7 +253,7 @@ public class EntityZombie extends EntityMonster {
}
public boolean a(EntityHuman entityhuman) {
ItemStack itemstack = entityhuman.bT();
ItemStack itemstack = entityhuman.bS();
if (itemstack != null && itemstack.getItem() == Item.GOLDEN_APPLE && itemstack.getData() == 0 && this.isVillager() && this.hasEffect(MobEffectList.WEAKNESS)) {
if (!entityhuman.abilities.canInstantlyBuild) {