Update to Minecraft 1.21.1

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2024-08-09 07:00:00 +10:00
commit 921fbc5f60
10 changed files with 27 additions and 53 deletions

View file

@ -1,17 +1,17 @@
--- a/net/minecraft/commands/arguments/ArgumentEntity.java
+++ b/net/minecraft/commands/arguments/ArgumentEntity.java
@@ -94,9 +94,15 @@
@@ -102,9 +102,15 @@
}
public EntitySelector parse(StringReader stringreader) throws CommandSyntaxException {
private EntitySelector parse(StringReader stringreader, boolean flag) throws CommandSyntaxException {
+ // CraftBukkit start
+ return parse(stringreader, false);
+ return parse(stringreader, flag, false);
+ }
+
+ public EntitySelector parse(StringReader stringreader, boolean overridePermissions) throws CommandSyntaxException {
+ public EntitySelector parse(StringReader stringreader, boolean flag, boolean overridePermissions) throws CommandSyntaxException {
+ // CraftBukkit end
boolean flag = false;
ArgumentParserSelector argumentparserselector = new ArgumentParserSelector(stringreader);
boolean flag1 = false;
ArgumentParserSelector argumentparserselector = new ArgumentParserSelector(stringreader, flag);
- EntitySelector entityselector = argumentparserselector.parse();
+ EntitySelector entityselector = argumentparserselector.parse(overridePermissions); // CraftBukkit