Update nms-patch

MohistMC · Sep 20, 2024 · 3e05053 · 3e05053
1 parent 76b6d6a
commit 3e05053
Show file tree

Hide file tree

Showing 73 changed files with 1,556 additions and 504 deletions.
diff --git a/nms-patches/net/minecraft/commands/arguments/ArgumentEntity.patch b/nms-patches/net/minecraft/commands/arguments/ArgumentEntity.patch
@@ -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
 

diff --git a/nms-patches/net/minecraft/commands/arguments/selector/ArgumentParserSelector.patch b/nms-patches/net/minecraft/commands/arguments/selector/ArgumentParserSelector.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/commands/arguments/selector/ArgumentParserSelector.java
 +++ b/net/minecraft/commands/arguments/selector/ArgumentParserSelector.java
-@@ -147,7 +147,7 @@
+@@ -158,7 +158,7 @@
              axisalignedbb = this.createAabb(this.deltaX == null ? 0.0D : this.deltaX, this.deltaY == null ? 0.0D : this.deltaY, this.deltaZ == null ? 0.0D : this.deltaZ);
          }
 
@@ -9,7 +9,7 @@
 
          if (this.x == null && this.y == null && this.z == null) {
              function = (vec3d) -> {
-@@ -204,8 +204,10 @@
+@@ -215,8 +215,10 @@
          };
      }
 
@@ -22,7 +22,7 @@
          this.suggestions = this::suggestSelector;
          if (!this.reader.canRead()) {
              throw ArgumentParserSelector.ERROR_MISSING_SELECTOR_TYPE.createWithContext(this.reader);
-@@ -494,6 +496,12 @@
+@@ -505,6 +507,12 @@
      }
 
      public EntitySelector parse() throws CommandSyntaxException {
@@ -35,7 +35,7 @@
          this.startPosition = this.reader.getCursor();
          this.suggestions = this::suggestNameOrSelector;
          if (this.reader.canRead() && this.reader.peek() == '@') {
-@@ -502,7 +510,7 @@
+@@ -513,7 +521,7 @@
              }
 
              this.reader.skip();

diff --git a/nms-patches/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.patch b/nms-patches/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.patch
@@ -0,0 +1,7 @@
+--- a/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
++++ b/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java
+@@ -1,3 +1,4 @@
++// mc-dev import
+ package net.minecraft.network.protocol.handshake;
+
+ import net.minecraft.network.PacketDataSerializer;