From 1697818ba27cb54184f6cf49db4528241117f8bb Mon Sep 17 00:00:00 2001 From: Fusezion Date: Sun, 16 Mar 2025 07:06:18 -0400 Subject: [PATCH 1/2] DefaultOperations.java - Add blank string default --- src/main/java/ch/njol/skript/classes/data/DefaultOperations.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java b/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java index dd8df4e36c3..42352119084 100644 --- a/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java +++ b/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java @@ -129,6 +129,7 @@ public class DefaultOperations { Arithmetics.registerDifference(Date.class, Timespan.class, Date::difference); // String - String + Arithmetics.registerDefaultValue(String.class, () -> ""); Arithmetics.registerOperation(Operator.ADDITION, String.class, String.class, String::concat); } From 5276068b686890c7a0f053cc6d7172dbbe2fc360 Mon Sep 17 00:00:00 2001 From: Fusezion Date: Sun, 16 Mar 2025 07:41:43 -0400 Subject: [PATCH 2/2] Fix test failing - forgot to test them --- .../regressions/7164-expressions sometimes dont convert.sk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/skript/tests/regressions/7164-expressions sometimes dont convert.sk b/src/test/skript/tests/regressions/7164-expressions sometimes dont convert.sk index f7954b3a642..01bc7edb773 100644 --- a/src/test/skript/tests/regressions/7164-expressions sometimes dont convert.sk +++ b/src/test/skript/tests/regressions/7164-expressions sometimes dont convert.sk @@ -2,7 +2,7 @@ test "expressions sometimes dont convert": assert formatted ({_foo} + {_bar}) is not set with "formatting nothing shouldn't throw an error" set {_foo} to "test" - assert formatted ({_foo} + {_bar}) is not set with "formatting string + none shouldn't throw an error" + assert formatted ({_foo} + {_bar}) is "test" with "formatting string + none shouldn't throw an error" set {_foo} to 1 set {_bar} to 2