Merge branch 'master' into 1.17
# Conflicts: # src/main/java/carpet/script/api/Auxiliary.java # src/main/java/carpet/script/api/Entities.java # src/main/java/carpet/script/api/Inventories.java # src/main/java/carpet/script/api/Scoreboards.java # src/main/java/carpet/script/api/WorldAccess.java # src/main/java/carpet/script/value/FunctionValue.java # src/main/java/carpet/script/value/NBTSerializableValue.java
This commit is contained in:
commit
5e3812e1f0
35 files changed
+1250
-1416
No files matched your search
@@ -291,7 +291,7 @@ public abstract class CommandArgument
|
||||
protected boolean needsMatching;
|
||||
protected boolean caseSensitive = true;
|
||||
protected SuggestionProvider<ServerCommandSource> suggestionProvider;
|
||||
protected FunctionArgument<Value> customSuggester;
|
||||
protected FunctionArgument customSuggester;
|
||||
|
||||
|
||||
protected CommandArgument(
|
||||
|
||||
Reference in new issue
Block a user