diff options
author | feildmaster <admin@feildmaster.com> | 2012-07-29 02:33:13 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2012-08-02 04:58:50 -0500 |
commit | a43d621c0138110d2ec362b2eaa8f938f241bb49 (patch) | |
tree | d2ebc0d7a4a969d3257b1b958236428a24117eb1 /src/main/java/net/minecraft/server/EntitySilverfish.java | |
parent | 08e2923bd4282579ca0cf7af0e6207cba0591e5c (diff) | |
download | craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.gz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.lz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.xz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.zip |
Update CraftBukkit to Minecraft 1.3.1
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySilverfish.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntitySilverfish.java | 62 |
1 files changed, 28 insertions, 34 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java index 88a80d73..35eba18a 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -4,13 +4,13 @@ import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class EntitySilverfish extends EntityMonster { - private int a; + private int d; public EntitySilverfish(World world) { super(world); this.texture = "/mob/silverfish.png"; - this.b(0.3F, 0.7F); - this.bb = 0.6F; + this.a(0.3F, 0.7F); + this.bw = 0.6F; this.damage = 1; } @@ -18,7 +18,7 @@ public class EntitySilverfish extends EntityMonster { return 8; } - protected boolean g_() { + protected boolean e_() { return false; } @@ -28,21 +28,21 @@ public class EntitySilverfish extends EntityMonster { return this.world.findNearbyVulnerablePlayer(this, d0); } - protected String i() { + protected String aQ() { return "mob.silverfish.say"; } - protected String j() { + protected String aR() { return "mob.silverfish.hit"; } - protected String k() { + protected String aS() { return "mob.silverfish.kill"; } public boolean damageEntity(DamageSource damagesource, int i) { - if (this.a <= 0 && damagesource instanceof EntityDamageSource) { - this.a = 20; + if (this.d <= 0 && (damagesource instanceof EntityDamageSource || damagesource == DamageSource.MAGIC)) { + this.d = 20; } return super.damageEntity(damagesource, i); @@ -59,34 +59,26 @@ public class EntitySilverfish extends EntityMonster { this.world.makeSound(this, "mob.silverfish.step", 1.0F, 1.0F); } - public void b(NBTTagCompound nbttagcompound) { - super.b(nbttagcompound); - } - - public void a(NBTTagCompound nbttagcompound) { - super.a(nbttagcompound); - } - protected int getLootId() { return 0; } - public void F_() { - this.V = this.yaw; - super.F_(); + public void h_() { + this.aq = this.yaw; + super.h_(); } - protected void d_() { - super.d_(); + protected void be() { + super.be(); if (!this.world.isStatic) { int i; int j; int k; int l; - if (this.a > 0) { - --this.a; - if (this.a == 0) { + if (this.d > 0) { + --this.d; + if (this.d == 0) { i = MathHelper.floor(this.locX); j = MathHelper.floor(this.locY); k = MathHelper.floor(this.locZ); @@ -103,6 +95,7 @@ public class EntitySilverfish extends EntityMonster { continue; } // CraftBukkit end + this.world.triggerEffect(2001, i + i1, j + l, k + j1, Block.MONSTER_EGGS.id + (this.world.getData(i + i1, j + l, k + j1) << 12)); this.world.setTypeId(i + i1, j + l, k + j1, 0); Block.MONSTER_EGGS.postBreak(this.world, i + i1, j + l, k + j1, 0); @@ -117,26 +110,27 @@ public class EntitySilverfish extends EntityMonster { } } - if (this.target == null && !this.H()) { + if (this.target == null && !this.l()) { i = MathHelper.floor(this.locX); j = MathHelper.floor(this.locY + 0.5D); k = MathHelper.floor(this.locZ); int l1 = this.random.nextInt(6); l = this.world.getTypeId(i + Facing.b[l1], j + Facing.c[l1], k + Facing.d[l1]); - if (BlockMonsterEggs.d(l)) { + if (BlockMonsterEggs.e(l)) { // CraftBukkit start if (CraftEventFactory.callEntityChangeBlockEvent(this, i + Facing.b[l1], j + Facing.c[l1], k + Facing.d[l1], Block.MONSTER_EGGS.id).isCancelled()) { return; } // CraftBukkit end - this.world.setTypeIdAndData(i + Facing.b[l1], j + Facing.c[l1], k + Facing.d[l1], Block.MONSTER_EGGS.id, BlockMonsterEggs.e(l)); - this.aC(); + + this.world.setTypeIdAndData(i + Facing.b[l1], j + Facing.c[l1], k + Facing.d[l1], Block.MONSTER_EGGS.id, BlockMonsterEggs.f(l)); + this.aK(); this.die(); } else { - this.G(); + this.j(); } - } else if (this.target != null && !this.H()) { + } else if (this.target != null && !this.l()) { this.target = null; } } @@ -146,7 +140,7 @@ public class EntitySilverfish extends EntityMonster { return this.world.getTypeId(i, j - 1, k) == Block.STONE.id ? 10.0F : super.a(i, j, k); } - protected boolean C() { + protected boolean o() { return true; } @@ -160,7 +154,7 @@ public class EntitySilverfish extends EntityMonster { } } - public MonsterType getMonsterType() { - return MonsterType.ARTHROPOD; + public EnumMonsterType getMonsterType() { + return EnumMonsterType.ARTHROPOD; } } |