update upstream

gommehdnet · Aug 17, 2024 · cbc4448 · cbc4448
1 parent 2b59d82
commit cbc4448
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.gommehd.cheetah
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=11b4ac7c659ffb7e4790b0856b14117b6d532200
+paperRef=52ae4ad4666b34d637f2de573ed03c02b0fc6a24
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0006-support-case-insensitive-commands.patch b/patches/server/0006-support-case-insensitive-commands.patch
@@ -8,10 +8,10 @@ Content-Transfer-Encoding: 8bit
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 60ff21c8df4168f14da04a12073bde47cd4693c4..ab2cee79a0786e5645a8bae2d21dd401b63a3b95 100644
+index 750f216400a473ed6895273c99ff89960bb56833..4ea2878f0e1e82b04b440a6a369d39c7d8a3fa80 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2262,10 +2262,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2334,10 +2334,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          return new SignedMessageChain.DecodeException(ServerGamePacketListenerImpl.INVALID_COMMAND_SIGNATURE);
      }
 

diff --git a/patches/server/0011-do-not-break-message-chain-if-proxy-cancels-a-chat-m.patch b/patches/server/0011-do-not-break-message-chain-if-proxy-cancels-a-chat-m.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] do not break message chain if proxy cancels a chat message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ab2cee79a0786e5645a8bae2d21dd401b63a3b95..a8b337e317ea5f89379fd7f65bf3898db03f9710 100644
+index 4ea2878f0e1e82b04b440a6a369d39c7d8a3fa80..1b6040982afec588bc6ab2ae8779cb8290946f3f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2073,12 +2073,23 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2145,12 +2145,23 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
 
      @Override
@@ -33,7 +33,7 @@ index ab2cee79a0786e5645a8bae2d21dd401b63a3b95..a8b337e317ea5f89379fd7f65bf3898d
          // CraftBukkit end
          Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(packet.lastSeenMessages());
 
-@@ -2093,6 +2104,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2165,6 +2176,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      return;
                  }
 
@@ -47,7 +47,7 @@ index ab2cee79a0786e5645a8bae2d21dd401b63a3b95..a8b337e317ea5f89379fd7f65bf3898d
                  CompletableFuture<FilteredText> completablefuture = this.filterTextPacket(playerchatmessage.signedContent()).thenApplyAsync(Function.identity(), this.server.chatExecutor); // CraftBukkit - async chat
                  CompletableFuture<Component> componentFuture = this.server.getChatDecorator().decorate(this.player, null, playerchatmessage.decoratedContent()); // Paper - Adventure
 
-@@ -2145,9 +2163,24 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2217,9 +2235,24 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
      @Override
      public void handleSignedChatCommand(ServerboundChatCommandSignedPacket packet) {