diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2014-06-26 13:05:08 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-07-08 14:31:10 -0500 |
commit | dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00 (patch) | |
tree | 062b1b273d0e0f337fde6b79f9377519d85c48c5 /src/main/java/net/minecraft/server/EntityMonster.java | |
parent | a8628fd645e12ec22bc525f49dd25f68d094f3ef (diff) | |
download | craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.gz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.lz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.xz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.zip |
Update CraftBukkit to Minecraft 1.7.10
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityMonster.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityMonster.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java index d13a91e4..49aef649 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java @@ -11,7 +11,7 @@ public abstract class EntityMonster extends EntityCreature implements IMonster { } public void e() { - this.ba(); + this.bb(); float f = this.d(1.0F); if (f > 0.5F) { @@ -28,18 +28,18 @@ public abstract class EntityMonster extends EntityCreature implements IMonster { } } - protected String G() { + protected String H() { return "game.hostile.swim"; } - protected String N() { + protected String O() { return "game.hostile.swim.splash"; } protected Entity findTarget() { EntityHuman entityhuman = this.world.findNearbyVulnerablePlayer(this, 16.0D); - return entityhuman != null && this.p(entityhuman) ? entityhuman : null; + return entityhuman != null && this.hasLineOfSight(entityhuman) ? entityhuman : null; } public boolean damageEntity(DamageSource damagesource, float f) { @@ -76,11 +76,11 @@ public abstract class EntityMonster extends EntityCreature implements IMonster { } } - protected String aS() { + protected String aT() { return "game.hostile.hurt"; } - protected String aT() { + protected String aU() { return "game.hostile.die"; } @@ -166,12 +166,12 @@ public abstract class EntityMonster extends EntityCreature implements IMonster { return this.world.difficulty != EnumDifficulty.PEACEFUL && this.j_() && super.canSpawn(); } - protected void aC() { - super.aC(); - this.bb().b(GenericAttributes.e); + protected void aD() { + super.aD(); + this.getAttributeMap().b(GenericAttributes.e); } - protected boolean aF() { + protected boolean aG() { return true; } } |