Adjust <player> and <npc> values to be more logical.

Adjusted player logic in "on entity damages entity" to player = damager first, then entity, same with npc.
DenizenScript · Jun 21, 2015 · 6a98fe9 · 6a98fe9
1 parent 22ab3a2
commit 6a98fe9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java
@@ -145,8 +145,8 @@ public boolean applyDetermination(ScriptContainer container, String determinatio
 
     @Override
     public ScriptEntryData getScriptEntryData() {
-        return new BukkitScriptEntryData(entity.isPlayer() ? dEntity.getPlayerFrom(event.getEntity()): null,
-                entity.isCitizensNPC() ? dEntity.getNPCFrom(event.getEntity()): null);
+        return new BukkitScriptEntryData(damager.isPlayer() ? damager.getDenizenPlayer(): entity.isPlayer() ? entity.getDenizenPlayer(): null,
+                damager.isCitizensNPC() ? damager.getDenizenNPC(): entity.isCitizensNPC() ? dEntity.getNPCFrom(event.getEntity()): null);
     }
 
     @Override