From 41bd425c6b6787c31c216e6aaf6d7be8065c5815 Mon Sep 17 00:00:00 2001
From: Alex 'mcmonkey' Goodwin <agoodwin@freneticllc.com>
Date: Sat, 12 Dec 2020 03:21:46 -0800
Subject: [PATCH] impl for new core commit

---
 .../denizen/objects/properties/item/ItemFlags.java            | 4 ++--
 .../denizen/scripts/commands/item/InventoryCommand.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFlags.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFlags.java
index 1e9b8bcf56..bc1414597e 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFlags.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFlags.java
@@ -62,7 +62,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
             ItemTag item = new ItemTag(this.item.getItemStack().clone());
             FlagCommand.FlagActionProvider provider = new FlagCommand.FlagActionProvider();
             provider.tracker = item.getFlagTracker();
-            DataAction action = DataActionHelper.parse(provider, attribute.getContext(1));
+            DataAction action = DataActionHelper.parse(provider, attribute.getContext(1), attribute.context);
 
             // <--[tag]
             // @attribute <ItemTag.with_flag[<flag_set_action>].duration[<expire_duration>]>
@@ -130,7 +130,7 @@ public void adjust(Mechanism mechanism) {
         if (mechanism.matches("flag")) {
             FlagCommand.FlagActionProvider provider = new FlagCommand.FlagActionProvider();
             provider.tracker = item.getFlagTracker();
-            DataAction action = DataActionHelper.parse(provider, mechanism.getValue().asString());
+            DataAction action = DataActionHelper.parse(provider, mechanism.getValue().asString(), mechanism.context);
             action.execute(mechanism.context);
             item.reapplyTracker(provider.tracker);
         }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java
index 688efa56d9..1a50150e52 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java
@@ -182,7 +182,7 @@ else if (!scriptEntry.hasObject("duration")
             }
             else if (!scriptEntry.hasObject("flag_action")
                     && isFlag) {
-                scriptEntry.addObject("flag_action", DataActionHelper.parse(new FlagCommand.FlagActionProvider(), arg.getRawValue()));
+                scriptEntry.addObject("flag_action", DataActionHelper.parse(new FlagCommand.FlagActionProvider(), arg, scriptEntry.context));
             }
             else {
                 arg.reportUnhandled();