summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntitySkeleton.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-03-26 22:32:56 +0100
committerErik Broes <erikbroes@grum.nl>2011-03-26 22:32:56 +0100
commite24b10dfd9d3b716b3c11ce46efd8caf54d52694 (patch)
treeab98237ae50bea2b7b1dec6f9445d9685c4cb4db /src/main/java/net/minecraft/server/EntitySkeleton.java
parent47497aa3f93083ce7d51a1509d03dd8ceb074bcf (diff)
downloadcraftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.tar
craftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.tar.gz
craftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.tar.lz
craftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.tar.xz
craftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.zip
Updated for the cleanups done in Bukkit
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySkeleton.java')
-rw-r--r--src/main/java/net/minecraft/server/EntitySkeleton.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
index b0c62ea2..945368e0 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
@@ -7,7 +7,6 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.event.Event.Type;
import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityDeathEvent;
// CraftBukkit end
@@ -40,10 +39,9 @@ public class EntitySkeleton extends EntityMonster {
if (f > 0.5F && this.world.i(MathHelper.b(this.locX), MathHelper.b(this.locY), MathHelper.b(this.locZ)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) {
// CraftBukkit start
CraftServer server = ((WorldServer) this.world).getServer();
- Type eventType = Type.ENTITY_COMBUST;
org.bukkit.entity.Entity entity = this.getBukkitEntity();
- EntityCombustEvent event = new EntityCombustEvent(eventType, entity);
+ EntityCombustEvent event = new EntityCombustEvent(entity);
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
@@ -109,7 +107,7 @@ public class EntitySkeleton extends EntityMonster {
Server server = ((WorldServer) world).getServer();
CraftEntity entity = (CraftEntity) getBukkitEntity();
- EntityDeathEvent event = new EntityDeathEvent(Type.ENTITY_DEATH, entity, loot);
+ EntityDeathEvent event = new EntityDeathEvent(entity, loot);
server.getPluginManager().callEvent(event);
for (org.bukkit.inventory.ItemStack stack: event.getDrops()) {