update upstream

gommehdnet · Dec 6, 2024 · 02c81aa · 02c81aa
1 parent aa8f0e3
commit 02c81aa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.gommehd.cheetah
 version=1.21.3-R0.1-SNAPSHOT
 
 mcVersion=1.21.3
-paperRef=d38624bdd8757f167552a278e6a355289aec7c48
+paperRef=da7138233f6392e791d790d1c3407414c855f9c2
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/api/0004-allow-skipping-log-messages-for-canceled-login-event.patch b/patches/api/0004-allow-skipping-log-messages-for-canceled-login-event.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] allow skipping log messages for canceled login events
 
 
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index ae02788536d0c6736aba4ccf812844df4f9789f1..7d47b0a324536a70ee6e7ed1235a2499e69ae868 100644
+index ff5cca4a7e75274b4b278a48ae1544ff42a9836a..89dcb2e10e0f563c879b947e68c3d4b157032ae5 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 @@ -27,6 +27,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
@@ -14,7 +14,7 @@ index ae02788536d0c6736aba4ccf812844df4f9789f1..7d47b0a324536a70ee6e7ed1235a2499
      private final boolean transferred;
 +    private boolean skipLog; // Cheetah - Allow skipping log messages for canceled login events
 
-     @Deprecated
+     @Deprecated(since = "1.7.5")
      public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
 @@ -297,6 +298,16 @@ public class AsyncPlayerPreLoginEvent extends Event {
          return transferred;
@@ -63,7 +63,7 @@ index eaa0548cf430bf5b58ff84e0a4403c451699db28..2a07caef10e00123818ac288a1cbccb8
       * Allows the player to log in
       */
 diff --git a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
-index 175ed12dd1698f4d153c9acdac8340c15a427ea5..36103261a69bf8c7da83c19e0ce462a572d7df98 100644
+index b323212f11f831a96d87f6c9d746a90d119a3efd..b101950f685587cf2940b13a8f0ba89859d1df28 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
 @@ -30,6 +30,7 @@ public class PlayerPreLoginEvent extends Event {
@@ -72,7 +72,7 @@ index 175ed12dd1698f4d153c9acdac8340c15a427ea5..36103261a69bf8c7da83c19e0ce462a5
      private final UUID uniqueId;
 +    private boolean skipLog; // Cheetah - Allow skipping log messages for canceled login events
 
-     @Deprecated
+     @Deprecated(since = "1.7.5")
      public PlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
 @@ -176,6 +177,16 @@ public class PlayerPreLoginEvent extends Event {
          return uniqueId;

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 cbd0f2c6636b8ae332f20a3cb763b06855dfe795..1e8f3df52cbb5de03fa4634cd160f440d64e535b 100644
+index 17e23ca4dd2bbfba49ea00aa2b719a95feb931be..6419e1c66f607cab07e0a7292cec00714eeb402d 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 {
+@@ -344,6 +344,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;

diff --git a/patches/server/0018-Fix-GLOBAL-1080-Paper-9350.patch b/patches/server/0018-Fix-GLOBAL-1080-Paper-9350.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix GLOBAL-1080 (Paper #9350)
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5b3a886c624b36557cbfaccdc3fb05a46a4ba36a..6fca35d9d39194f77df2c9c09667e11f947a98ee 100644
+index cfeeddf2cb4ff50dbc29c6913e78ca1dee076790..960b28620ae4fc75e61be73eddcd4f1bc7d4e28d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1294,6 +1294,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1288,6 +1288,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  flag = flag && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z);
                  // Paper end - Configurable entity tracking range by Y
 
@@ -18,7 +18,7 @@ index 5b3a886c624b36557cbfaccdc3fb05a46a4ba36a..6fca35d9d39194f77df2c9c09667e11f
                  if (flag && !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Paper - only consider hits
                      flag = false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cffbd3300967e5d80b5973b35a76235bb2aa1b73..9dd0c7b15068733c746f091f71122606c8b3ff5f 100644
+index 5a8f396d47577f087abb415c972fd4f51e50faba..9553c4ca501ab3414c4d60bc8fcc4529adff8f46 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1013,8 +1013,23 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple