From a49f1348de595352e00327b6adf1e2e3cbe0b459 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Fri, 20 Dec 2019 15:38:54 -0800 Subject: [PATCH] fix some obtuse code in events (entity-npc conversion) --- .../denizen/events/entity/EntityDamagedScriptEvent.java | 2 +- .../denizen/events/entity/EntityKilledScriptEvent.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java index 729c2792e1..e730e23548 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java @@ -139,7 +139,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { @Override public ScriptEntryData getScriptEntryData() { return new BukkitScriptEntryData(damager != null && damager.isPlayer() ? damager.getDenizenPlayer() : entity.isPlayer() ? entity.getDenizenPlayer() : null, - damager != null && damager.isCitizensNPC() ? damager.getDenizenNPC() : entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null); + damager != null && damager.isCitizensNPC() ? damager.getDenizenNPC() : entity.isCitizensNPC() ? entity.getDenizenNPC() : null); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityKilledScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityKilledScriptEvent.java index 620669e74d..0a2869a063 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityKilledScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityKilledScriptEvent.java @@ -134,9 +134,9 @@ public ScriptEntryData getScriptEntryData() { if (damager != null && player == null && damager.isPlayer()) { player = EntityTag.getPlayerFrom(damager.getBukkitEntity()); } - NPCTag npc = entity.isCitizensNPC() ? EntityTag.getNPCFrom(event.getEntity()) : null; + NPCTag npc = entity.isCitizensNPC() ? entity.getDenizenNPC() : null; if (damager != null && npc == null && damager.isCitizensNPC()) { - npc = EntityTag.getNPCFrom(damager.getBukkitEntity()); + npc = damager.getDenizenNPC(); } return new BukkitScriptEntryData(player, npc); }