diff options
author | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-07-01 06:03:00 -0500 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-07-01 12:10:06 -0500 |
commit | 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (patch) | |
tree | 573e05f4b148cb1891a1d3839175e501e6257442 /src/main/java/net/minecraft/server/EntityPigZombie.java | |
parent | f887b76a259e12468b28d82d1eced93f0b73bd6d (diff) | |
download | craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.gz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.lz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.xz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.zip |
Update CraftBukkit to 1.6.1
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPigZombie.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityPigZombie.java | 72 |
1 files changed, 40 insertions, 32 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java index 8a6dda60..3bc0f925 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -1,6 +1,7 @@ package net.minecraft.server; import java.util.List; +import java.util.UUID; // CraftBukkit start import org.bukkit.craftbukkit.inventory.CraftItemStack; @@ -9,24 +10,41 @@ import org.bukkit.event.entity.EntityTargetEvent; public class EntityPigZombie extends EntityZombie { - public int angerLevel = 0; // CraftBukkit - private -> public - private int soundDelay = 0; + private static final UUID bq = UUID.fromString("49455A49-7EC5-45BA-B886-3B90B23A1718"); + private static final AttributeModifier br = (new AttributeModifier(bq, "Attacking speed boost", 0.45D, 0)).a(false); + public int angerLevel; // CraftBukkit - private -> public + private int soundDelay; + private Entity bu; public EntityPigZombie(World world) { super(world); - this.texture = "/mob/pigzombie.png"; - this.bI = 0.5F; this.fireProof = true; } - protected boolean bh() { + protected void ax() { + super.ax(); + this.a(bp).a(0.0D); + this.a(GenericAttributes.d).a(0.5D); + this.a(GenericAttributes.e).a(5.0D); + } + + protected boolean bb() { return false; } public void l_() { - this.bI = this.target != null ? 0.95F : 0.5F; + if (this.bu != this.target && !this.world.isStatic) { + AttributeInstance attributeinstance = this.a(GenericAttributes.d); + + attributeinstance.b(br); + if (this.target != null) { + attributeinstance.a(br); + } + } + + this.bu = this.target; if (this.soundDelay > 0 && --this.soundDelay == 0) { - this.makeSound("mob.zombiepig.zpigangry", this.ba() * 2.0F, ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) * 1.8F); + this.makeSound("mob.zombiepig.zpigangry", this.aW() * 2.0F, ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) * 1.8F); } super.l_(); @@ -50,7 +68,7 @@ public class EntityPigZombie extends EntityZombie { return this.angerLevel == 0 ? null : super.findTarget(); } - public boolean damageEntity(DamageSource damagesource, int i) { + public boolean damageEntity(DamageSource damagesource, float f) { if (this.isInvulnerable()) { return false; } else { @@ -59,24 +77,24 @@ public class EntityPigZombie extends EntityZombie { if (entity instanceof EntityHuman) { List list = this.world.getEntities(this, this.boundingBox.grow(32.0D, 32.0D, 32.0D)); - for (int j = 0; j < list.size(); ++j) { - Entity entity1 = (Entity) list.get(j); + for (int i = 0; i < list.size(); ++i) { + Entity entity1 = (Entity) list.get(i); if (entity1 instanceof EntityPigZombie) { EntityPigZombie entitypigzombie = (EntityPigZombie) entity1; - entitypigzombie.p(entity); + entitypigzombie.c(entity); } } - this.p(entity); + this.c(entity); } - return super.damageEntity(damagesource, i); + return super.damageEntity(damagesource, f); } } - private void p(Entity entity) { + private void c(Entity entity) { // CraftBukkit start org.bukkit.entity.Entity bukkitTarget = entity == null ? null : entity.getBukkitEntity(); @@ -99,15 +117,15 @@ public class EntityPigZombie extends EntityZombie { this.soundDelay = this.random.nextInt(40); } - protected String bb() { + protected String r() { return "mob.zombiepig.zpig"; } - protected String bc() { + protected String aK() { return "mob.zombiepig.zpighurt"; } - protected String bd() { + protected String aL() { return "mob.zombiepig.zpigdeath"; } @@ -142,7 +160,7 @@ public class EntityPigZombie extends EntityZombie { // CraftBukkit end } - public boolean a_(EntityHuman entityhuman) { + public boolean a(EntityHuman entityhuman) { return false; } @@ -156,23 +174,13 @@ public class EntityPigZombie extends EntityZombie { return Item.ROTTEN_FLESH.id; } - protected void bH() { + protected void bs() { this.setEquipment(0, new ItemStack(Item.GOLD_SWORD)); } - public void bJ() { - super.bJ(); + public GroupDataEntity a(GroupDataEntity groupdataentity) { + super.a(groupdataentity); this.setVillager(false); - } - - public int c(Entity entity) { - ItemStack itemstack = this.bG(); - int i = 5; - - if (itemstack != null) { - i += itemstack.a((Entity) this); - } - - return i; + return groupdataentity; } } |