Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
This commit is contained in:
gnembon committed 2021-04-19 23:42:38 -03:00
commit 709d74ea47
4 files changed
+112 -140

No files matched your search

@@ -42,6 +42,11 @@ public class FormattedTextValue extends StringValue
}
}
public static Value of(Text text) {
if (text == null) return Value.NULL;
return new FormattedTextValue(text);
}
@Override
public String getString() {
return text.getString();