fix some old npc action entity contexts

DenizenScript · May 30, 2020 · cdcb8f7 · cdcb8f7
1 parent a54ac54
commit cdcb8f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MobproxTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MobproxTrait.java
@@ -108,7 +108,7 @@ public void run() {
     // -->
     private void callAction(String act, Entity ent) {
         Map<String, ObjectTag> context = new HashMap<>();
-        context.put("entity", new EntityTag(ent));
+        context.put("entity", new EntityTag(ent).getDenizenObject());
         dnpc.action("mob " + act + " proximity", null, context);
         dnpc.action(ent.getType().name() + " " + act + " proximity", null, context);
     }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/DamageTrigger.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/DamageTrigger.java
@@ -97,7 +97,7 @@ public void damageTrigger(EntityDamageByEntityEvent event) {
             if (damager.isProjectile() && damager.hasShooter()) {
                 damager = damager.getShooter();
             }
-            context.put("damager", damager);
+            context.put("damager", damager.getDenizenObject());
 
             String determ = npc.action("damaged", null, context);
             if (determ != null && determ.equalsIgnoreCase("CANCELLED")) {