update upstream

gommehdnet · Aug 25, 2024 · 141e92f · 141e92f
1 parent c614282
commit 141e92f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 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=64c9ee6584ce15e5b486bdc7183fe902e22fddf3
+paperRef=e2da65c689ae2cf55474e542cbc931a3343ae11e
 
 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 750f216400a473ed6895273c99ff89960bb56833..4ea2878f0e1e82b04b440a6a369d39c7d8a3fa80 100644
+index b13057c0792067cc6b0abdf0d64a9be2cc9389a4..4bcccc5a90f4a0fc2d03e3ef35289ce3b4301ba1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2334,10 +2334,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2338,10 +2338,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 4ea2878f0e1e82b04b440a6a369d39c7d8a3fa80..1b6040982afec588bc6ab2ae8779cb8290946f3f 100644
+index 4bcccc5a90f4a0fc2d03e3ef35289ce3b4301ba1..76c312a51398eadd6b19848a2bddfc4724861c7c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2145,12 +2145,23 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2149,12 +2149,23 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
 
      @Override
@@ -33,7 +33,7 @@ index 4ea2878f0e1e82b04b440a6a369d39c7d8a3fa80..1b6040982afec588bc6ab2ae8779cb82
          // CraftBukkit end
          Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(packet.lastSeenMessages());
 
-@@ -2165,6 +2176,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2169,6 +2180,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      return;
                  }
 
@@ -47,7 +47,7 @@ index 4ea2878f0e1e82b04b440a6a369d39c7d8a3fa80..1b6040982afec588bc6ab2ae8779cb82
                  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
 
-@@ -2217,9 +2235,24 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2221,9 +2239,24 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
      @Override
      public void handleSignedChatCommand(ServerboundChatCommandSignedPacket packet) {

diff --git a/patches/server/0014-added-option-to-disable-elytra-in-end-cities.patch b/patches/server/0014-added-option-to-disable-elytra-in-end-cities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable elytra in end cities
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 214ea75502d4abf9ebbc99a3811e4d2f8465227e..465dae03643af07e8c87758aad95ecc9b0bb9fa0 100644
+index 690086adcb1f87adc0b3ab664fde735ad3e1093a..8792dd1d6a8d37a535048f184f127941fe16399d 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -346,6 +346,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -347,6 +347,7 @@ public class GlobalConfiguration extends ConfigurationPart {
          public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
          @Comment("Defines the leniency distance added on the server to the interaction range of a player when validating interact packets.")
          public DoubleOr.Default clientInteractionLeniencyDistance = DoubleOr.Default.USE_DEFAULT;