Rewrote "on entity death" event in new ScriptEvent format.

DenizenScript · Jun 11, 2015 · 2a1ea83 · 2a1ea83
1 parent 69afe8f
commit 2a1ea83
Show file tree

Hide file tree

Showing 3 changed files with 233 additions and 186 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -569,7 +569,6 @@ public void onEnable() {
             // Register all the 'Core' SmartEvents.
             OldEventManager.registerSmartEvent(new CommandSmartEvent());
             OldEventManager.registerSmartEvent(new CuboidEnterExitSmartEvent());
-            OldEventManager.registerSmartEvent(new EntityDeathSmartEvent());
             OldEventManager.registerSmartEvent(new EntityInteractSmartEvent());
             OldEventManager.registerSmartEvent(new EntitySpawnSmartEvent());
             OldEventManager.registerSmartEvent(new FlagSmartEvent());
@@ -595,6 +594,7 @@ public void onEnable() {
             ScriptEvent.registerScriptEvent(new ChunkUnloadScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityCombustsScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityDamagedScriptEvent());
+            ScriptEvent.registerScriptEvent(new EntityDeathScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityDespawnScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityKilledScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityTeleportScriptEvent());

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/EntityDeathSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/EntityDeathSmartEvent.java