From c5139ce3627ac76963dc5c7494b6349d557fcd2b Mon Sep 17 00:00:00 2001
From: Aya <31237389+tal5@users.noreply.github.com>
Date: Wed, 30 Jul 2025 21:51:14 +0100
Subject: [PATCH] Improve `ObjectProperty` overriding behavior

---
 .../denizencore/objects/properties/ObjectProperty.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/denizenscript/denizencore/objects/properties/ObjectProperty.java b/src/main/java/com/denizenscript/denizencore/objects/properties/ObjectProperty.java
index fae86bb9..ed85b30a 100644
--- a/src/main/java/com/denizenscript/denizencore/objects/properties/ObjectProperty.java
+++ b/src/main/java/com/denizenscript/denizencore/objects/properties/ObjectProperty.java
@@ -22,19 +22,19 @@ public boolean isDefaultValue(TData data) {
     @Override
     public TData getPropertyValueNoDefault() {
         TData res = getPropertyValue();
-        return res == null || isDefaultValue(res) ? null : getPropertyValue();
+        return res == null || isDefaultValue(res) ? null : res;
     }
 
     @Override
     public String getPropertySavableValue() {
-        TData res = getPropertyValue();
-        return res == null || isDefaultValue(res) ? null : getPropertyValue().savable();
+        TData res = getPropertyValueNoDefault();
+        return res == null ? null : res.savable();
     }
 
     @Deprecated @Override
     public String getPropertyString() {
-        TData res = getPropertyValue();
-        return res == null || isDefaultValue(res) ? null : getPropertyValue().identify();
+        TData res = getPropertyValueNoDefault();
+        return res == null ? null : res.identify();
     }
 
     public abstract void setPropertyValue(TData data, Mechanism mechanism);