Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java
Auxilor · Jul 16, 2023 · ee237f9 · ee237f9
2 parents 739d9cf + 0a80518
commit ee237f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java
@@ -598,7 +598,7 @@ default double getDoubleFromExpression(@NotNull String path,
     default double getDoubleFromExpression(@NotNull String path,
                                            @NotNull PlaceholderContext context) {
         return Objects.requireNonNullElseGet(
-                getDoubleOrNull(path),
+                this.getDoubleOrNull(path),
                 () -> NumberUtils.evaluateExpression(this.getString(path), context.withInjectableContext(this))
         );
     }

diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserHead.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserHead.kt
@@ -48,6 +48,10 @@ object ArgParserHead : LookupArgParser {
             return null
         }
 
+        if (meta.owningPlayer!!.name.equals("null", true) || meta.owningPlayer!!.name == null) {
+            return null
+        }
+
         return "head:${meta.owningPlayer?.name}"
     }
 }