Fix meta, use getDenizenObject more

NPCs and Players and lightning, oh my!
DenizenScript · Jan 10, 2015 · 71ee159 · 71ee159
1 parent 69aee8a
commit 71ee159
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/core/EntityDeathSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/EntityDeathSmartEvent.java
@@ -104,7 +104,7 @@ public void entityDeath(EntityDeathEvent event) {
         // remove it from the entityKillers map
         EntityDamageEvent lastDamage = entity.getBukkitEntity().getLastDamageCause();
         if (lastDamage != null && lastDamage instanceof EntityDamageByEntityEvent) {
-            context.put("damager", new dEntity(((EntityDamageByEntityEvent) lastDamage).getDamager()));
+            context.put("damager", new dEntity(((EntityDamageByEntityEvent) lastDamage).getDamager()).getDenizenObject());
         }
 
         PlayerDeathEvent subEvent = null;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java
@@ -494,7 +494,7 @@ public void blockIgnite(BlockIgniteEvent event) {
         context.put("material", material);
         context.put("cause", new Element(event.getCause().name()));
         if (event.getIgnitingEntity() != null) {
-            context.put("entity", new dEntity(event.getIgnitingEntity()));
+            context.put("entity", new dEntity(event.getIgnitingEntity()).getDenizenObject());
         }
 
         String determination = EventManager.doEvents(Arrays.asList
@@ -4265,7 +4265,7 @@ public void vehicleExit(VehicleExitEvent event) {
     // @Triggers when lightning strikes in a world.
     // @Context
     // <context.world> returns the dWorld the lightning struck in.
-    // <context.reason> returns the dLocation where the lightning struck.
+    // <context.location> returns the dLocation where the lightning struck.
     //
     // @Determine
     // "CANCELLED" to stop the lightning from striking.