Mechs should use pickObjectFor

DenizenScript · Jan 29, 2024 · 4f27f73 · 4f27f73
1 parent 8942c3e
commit 4f27f73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/objects/ObjectFetcher.java b/src/main/java/com/denizenscript/denizencore/objects/ObjectFetcher.java
@@ -411,7 +411,7 @@ public static void applyPropertySet(Adjustable object, TagContext context, List<
                 continue;
             }
             String description = unescapeProperty(data.get(1));
-            object.safeApplyProperty(new Mechanism(data.get(0), new ElementTag(description), context));
+            object.safeApplyProperty(new Mechanism(data.get(0), pickObjectFor(description, context), context));
         }
     }
 

diff --git a/src/main/java/com/denizenscript/denizencore/objects/properties/PropertyParser.java b/src/main/java/com/denizenscript/denizencore/objects/properties/PropertyParser.java
@@ -481,7 +481,7 @@ public static <T extends Adjustable> void registerPropertyTagHandlers(Class<T> t
                     Debug.echoError("Invalid property string '" + properties.get(i) + "'!");
                 }
                 else {
-                    instance.safeApplyProperty(new Mechanism(data.get(0), new ElementTag(data.get(1)), attribute.context));
+                    instance.safeApplyProperty(new Mechanism(data.get(0), ObjectFetcher.pickObjectFor(data.get(1), attribute.context), attribute.context));
                 }
             }
             return instance;
@@ -505,7 +505,7 @@ public static <T extends Adjustable> void registerPropertyTagHandlers(Class<T> t
                 Debug.echoError("Invalid property string '" + attribute.getParam() + "'!");
             }
             else {
-                instance.safeApplyProperty(new Mechanism(data.get(0), new ElementTag(data.get(1)), attribute.context));
+                instance.safeApplyProperty(new Mechanism(data.get(0), ObjectFetcher.pickObjectFor(data.get(1), attribute.context), attribute.context));
             }
             return instance;
         });