diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-04-20 19:05:14 +0200 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-04-20 19:05:14 +0200 |
commit | 483a878b8bcf1feb789cb5fd9374d0a060cc4d8a (patch) | |
tree | fb56faee3872a85282e2fa88235580589c826e45 /src/main/java/net/minecraft/server/EntityMonster.java | |
parent | ac9f297445a6116c5bb314b3be9f38520a58845e (diff) | |
download | craftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.tar craftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.tar.gz craftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.tar.lz craftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.tar.xz craftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.zip |
Update for 1.4_00_01 -- if you bypassed Bukkit, you will most likely break.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityMonster.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityMonster.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java index 91b95075..b464df95 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java @@ -13,7 +13,7 @@ import org.bukkit.event.entity.EntityTargetEvent.TargetReason; public class EntityMonster extends EntityCreature implements IMonster { - protected int c = 2; + protected int damage = 2; public EntityMonster(World world) { super(world); @@ -32,19 +32,19 @@ public class EntityMonster extends EntityCreature implements IMonster { public void f_() { super.f_(); - if (this.world.j == 0) { - this.D(); + if (this.world.spawnMonsters == 0) { + this.die(); } } - protected Entity m() { + protected Entity findTarget() { EntityHuman entityhuman = this.world.a(this, 16.0D); return entityhuman != null && this.e(entityhuman) ? entityhuman : null; } - public boolean a(Entity entity, int i) { - if (super.a(entity, i)) { + public boolean damageEntity(Entity entity, int i) { + if (super.damageEntity(entity, i)) { if (this.passenger != entity && this.vehicle != entity) { if (entity != this) { // CraftBukkit start @@ -59,9 +59,9 @@ public class EntityMonster extends EntityCreature implements IMonster { if (!event.isCancelled()) { if (event.getTarget() == null) { - this.d = null; + this.target = null; } else { - this.d = ((CraftEntity) event.getTarget()).getHandle(); + this.target = ((CraftEntity) event.getTarget()).getHandle(); } } // CraftBukkit end @@ -88,17 +88,17 @@ public class EntityMonster extends EntityCreature implements IMonster { org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); DamageCause damageType = EntityDamageEvent.DamageCause.ENTITY_ATTACK; - EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(damager, damagee, damageType, this.c); + EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(damager, damagee, damageType, this.damage); server.getPluginManager().callEvent(event); - if (!event.isCancelled() && event.getDamage() != 0) { - entity.a(this, event.getDamage()); + if (!event.isCancelled()) { + entity.damageEntity(this, event.getDamage()); } return; } // CraftBukkit end - entity.a(this, this.c); + entity.damageEntity(this, this.damage); } } @@ -115,14 +115,14 @@ public class EntityMonster extends EntityCreature implements IMonster { } public boolean b() { - int i = MathHelper.b(this.locX); - int j = MathHelper.b(this.boundingBox.b); - int k = MathHelper.b(this.locZ); + int i = MathHelper.floor(this.locX); + int j = MathHelper.floor(this.boundingBox.b); + int k = MathHelper.floor(this.locZ); if (this.world.a(EnumSkyBlock.SKY, i, j, k) > this.random.nextInt(32)) { return false; } else { - int l = this.world.j(i, j, k); + int l = this.world.getLightLevel(i, j, k); return l <= this.random.nextInt(8) && super.b(); } |