From 6a98fe9f0383e76421a54cc510b4b2c1ffae127f Mon Sep 17 00:00:00 2001
From: Talamar1 <me@danielchester.com>
Date: Sun, 21 Jun 2015 10:57:41 -0400
Subject: [PATCH] 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.
---
 .../denizen/events/entity/EntityDamagedScriptEvent.java       | 4 ++--
 1 file changed, 2 insertions(+), 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
index 48991616c5..2fdd413914 100644
--- 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