diff options
author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-12-19 18:32:35 +1100 |
---|---|---|
committer | Andrew Ardill <andrew.ardill@gmail.com> | 2011-12-19 18:32:35 +1100 |
commit | b0ab686964e1ea9657efc51bc07fdc621e7512fc (patch) | |
tree | e81505fe9335b4b069a8f6af14fbda1ef35d3121 /src/main/java/net/minecraft | |
parent | a7744ac751842e1adbeb1ee125bf8be093d4e0bc (diff) | |
download | craftbukkit-b0ab686964e1ea9657efc51bc07fdc621e7512fc.tar craftbukkit-b0ab686964e1ea9657efc51bc07fdc621e7512fc.tar.gz craftbukkit-b0ab686964e1ea9657efc51bc07fdc621e7512fc.tar.lz craftbukkit-b0ab686964e1ea9657efc51bc07fdc621e7512fc.tar.xz craftbukkit-b0ab686964e1ea9657efc51bc07fdc621e7512fc.zip |
Avoid some avoidable calls, clean PluginManager accessors
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 41105127..2839fa7b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1200,15 +1200,17 @@ public abstract class Entity { // b(null) doesn't really fly for overloaded methods, // so this method is needed + PluginManager pluginManager = Bukkit.getPluginManager(); + this.getBukkitEntity(); // make sure bukkitEntity is initialised // CraftBukkit end this.e = 0.0D; this.f = 0.0D; if (entity == null) { if (this.vehicle != null) { // CraftBukkit start - if ((this.getBukkitEntity() instanceof LivingEntity) && (this.vehicle.getBukkitEntity() instanceof Vehicle)) { - VehicleExitEvent event = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.getBukkitEntity()); - this.world.getServer().getPluginManager().callEvent(event); + if ((this.bukkitEntity instanceof LivingEntity) && (this.vehicle.getBukkitEntity() instanceof Vehicle)) { + VehicleExitEvent event = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity); + pluginManager.callEvent(event); } // CraftBukkit end @@ -1219,9 +1221,9 @@ public abstract class Entity { this.vehicle = null; } else if (this.vehicle == entity) { // CraftBukkit start - if ((this.getBukkitEntity() instanceof LivingEntity) && (this.vehicle.getBukkitEntity() instanceof Vehicle)) { - VehicleExitEvent event = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.getBukkitEntity()); - this.world.getServer().getPluginManager().callEvent(event); + if ((this.bukkitEntity instanceof LivingEntity) && (this.vehicle.getBukkitEntity() instanceof Vehicle)) { + VehicleExitEvent event = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity); + pluginManager.callEvent(event); } // CraftBukkit end @@ -1230,10 +1232,10 @@ public abstract class Entity { this.setPositionRotation(entity.locX, entity.boundingBox.b + (double) entity.length, entity.locZ, this.yaw, this.pitch); } else { // CraftBukkit start - if ((this.getBukkitEntity() instanceof LivingEntity) && (entity != null) && (entity.getBukkitEntity() instanceof Vehicle)) { - VehicleEnterEvent event = new VehicleEnterEvent((Vehicle) entity.getBukkitEntity(), (LivingEntity) this.getBukkitEntity()); - this.world.getServer().getPluginManager().callEvent(event); - + if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle)) { + VehicleEnterEvent event = new VehicleEnterEvent((Vehicle) entity.getBukkitEntity(), this.bukkitEntity); + pluginManager.callEvent(event); + if (event.isCancelled()) { return; } |