diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
commit | 5b2c774edc069f70d1fa9940d96bb0b8705bef7a (patch) | |
tree | 79d1800e7154bba7b5fca4f8c8373ee4376cca89 /src/main/java/net/minecraft/server/EntityCreeper.java | |
parent | 54bcd1c1f36691a714234e5ca2f30a20b3ad2816 (diff) | |
download | craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.gz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.lz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.xz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.zip |
Update for Minecraft 1.8
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityCreeper.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityCreeper.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java index 31743fe1..b31231a0 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -37,7 +37,7 @@ public class EntityCreeper extends EntityMonster { protected void b(Entity entity, float f) { if (!this.world.isStatic) { if (this.fuseTicks > 0) { - this.e(-1); + this.b(-1); --this.fuseTicks; if (this.fuseTicks < 0) { this.fuseTicks = 0; @@ -46,10 +46,10 @@ public class EntityCreeper extends EntityMonster { } } - public void m_() { + public void s_() { this.b = this.fuseTicks; if (this.world.isStatic) { - int i = this.x(); + int i = this.w(); if (i > 0 && this.fuseTicks == 0) { this.world.makeSound(this, "random.fuse", 1.0F, 0.5F); @@ -65,9 +65,9 @@ public class EntityCreeper extends EntityMonster { } } - super.m_(); + super.s_(); if (this.target == null && this.fuseTicks > 0) { - this.e(-1); + this.b(-1); --this.fuseTicks; if (this.fuseTicks < 0) { this.fuseTicks = 0; @@ -75,27 +75,27 @@ public class EntityCreeper extends EntityMonster { } } - protected String h() { + protected String i() { return "mob.creeper"; } - protected String i() { + protected String j() { return "mob.creeperdeath"; } - public void die(Entity entity) { - super.die(entity); - if (entity instanceof EntitySkeleton) { + public void die(DamageSource damagesource) { + super.die(damagesource); + if (damagesource.a() instanceof EntitySkeleton) { this.b(Item.GOLD_RECORD.id + this.random.nextInt(2), 1); } } protected void a(Entity entity, float f) { if (!this.world.isStatic) { - int i = this.x(); + int i = this.w(); if ((i > 0 || f >= 3.0F) && (i <= 0 || f >= 7.0F)) { - this.e(-1); + this.b(-1); --this.fuseTicks; if (this.fuseTicks < 0) { this.fuseTicks = 0; @@ -105,7 +105,7 @@ public class EntityCreeper extends EntityMonster { this.world.makeSound(this, "random.fuse", 1.0F, 0.5F); } - this.e(1); + this.b(1); ++this.fuseTicks; if (this.fuseTicks >= 30) { // CraftBukkit start @@ -132,15 +132,15 @@ public class EntityCreeper extends EntityMonster { return this.datawatcher.a(17) == 1; } - protected int j() { + protected int k() { return Item.SULPHUR.id; } - private int x() { + private int w() { return this.datawatcher.a(16); } - private void e(int i) { + private void b(int i) { this.datawatcher.watch(16, Byte.valueOf((byte) i)); } |