From be1cb6888a7e6ff454a4c1bcb7ba82a0531ee732 Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 2 Oct 2022 18:11:15 +0200 Subject: [PATCH] Remove redundant `null` checks in string concat --- src/main/java/carpet/script/value/Value.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/carpet/script/value/Value.java b/src/main/java/carpet/script/value/Value.java index ccf26643..c186a7b8 100644 --- a/src/main/java/carpet/script/value/Value.java +++ b/src/main/java/carpet/script/value/Value.java @@ -66,19 +66,13 @@ public abstract class Value implements Comparable, Cloneable public abstract boolean getBoolean(); public Value add(Value o) { - String lstr = this.getString(); if (o instanceof FormattedTextValue) { return FormattedTextValue.combine(this, o); } - if (lstr == null) // null - return new StringValue(o.getString()); - String rstr = o.getString(); - if (rstr == null) - { - return new StringValue(lstr); - } - return new StringValue(lstr+rstr); + String leftStr = this.getString(); + String rightStr = o.getString(); + return new StringValue(leftStr + rightStr); } public Value subtract(Value v) {