update upstream

gommehdnet · Sep 17, 2024 · 7534374 · 7534374
1 parent 2b5d2a2
commit 7534374
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 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=925c3b9d2b4a4a1c0a6ea4dc2b06f4009cde02aa
+paperRef=2aaf4369b61256c28c205ec1152132760b310ebd
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch b/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added ProjectileAllowCollideWithPlayerEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index de64de5d1328d3e0826c9990eb7c7eca5088cb9c..3b0cd13ac6837e58ab1eec800b4a1523c6b11a2e 100644
+index 10ade433c083851d9ea4797c6ec618db122229f9..492aea1dbac4c1839a8a49296ed9389c79c7f03a 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -322,7 +322,10 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -319,7 +319,10 @@ public abstract class Projectile extends Entity implements TraceableEntity {
              if (entity1 instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer) {
                  org.bukkit.entity.Player collided = (org.bukkit.entity.Player) entity.getBukkitEntity();
                  org.bukkit.entity.Player shooter = (org.bukkit.entity.Player) entity1.getBukkitEntity();
@@ -21,7 +21,7 @@ index de64de5d1328d3e0826c9990eb7c7eca5088cb9c..3b0cd13ac6837e58ab1eec800b4a1523
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 77ef27f9254235180a8596c6c8c4af750dc759d1..5686b200c18fefca82e04c80d15186a00515bf85 100644
+index 4632eb883e9f5efde520ee543bcad25827c0da2c..4354d55627c7a622f4629c33d4dd9c5579538e19 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -15,6 +15,7 @@ import java.util.Map;

diff --git a/patches/server/0009-allow-skipping-log-messages-for-canceled-login-event.patch b/patches/server/0009-allow-skipping-log-messages-for-canceled-login-event.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] allow skipping log messages for canceled login events
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b0f7a378f19b9837c060c891002cd5db756cdae1..025a3f18e521d65ddc924575c153e814f95e08b1 100644
+index 40638b439966619e9c70a18a32abd95b2178fe9f..46d613b6a679222267b16ca6341066df300831ee 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -87,6 +87,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -92,6 +92,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
      private ServerPlayer player; // CraftBukkit
      public boolean iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation = false; // Paper - username validation overriding
      private int velocityLoginMessageId = -1; // Paper - Add Velocity IP Forwarding Support
 +    private boolean disconnectLogged = false; // Cheetah - Allow skipping log messages for canceled login events
 
      public ServerLoginPacketListenerImpl(MinecraftServer server, Connection connection, boolean transferred) {
          this.state = ServerLoginPacketListenerImpl.State.HELLO;
-@@ -140,8 +141,15 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -145,8 +146,15 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
      }
 
      public void disconnect(Component reason) {
@@ -33,7 +33,7 @@ index b0f7a378f19b9837c060c891002cd5db756cdae1..025a3f18e521d65ddc924575c153e814
              this.connection.send(new ClientboundLoginDisconnectPacket(reason));
              this.connection.disconnect(reason);
          } catch (Exception exception) {
-@@ -156,7 +164,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -161,7 +169,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
 
      @Override
      public void onDisconnect(DisconnectionDetails info) {
@@ -42,7 +42,7 @@ index b0f7a378f19b9837c060c891002cd5db756cdae1..025a3f18e521d65ddc924575c153e814
      }
 
      public String getUserName() {
-@@ -371,12 +379,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -376,12 +384,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
          playerName = gameprofile.getName();
          uniqueId = gameprofile.getId();
          // Paper end - Add more fields to AsyncPlayerPreLoginEvent
@@ -57,7 +57,7 @@ index b0f7a378f19b9837c060c891002cd5db756cdae1..025a3f18e521d65ddc924575c153e814
              Waitable<PlayerPreLoginEvent.Result> waitable = new Waitable<PlayerPreLoginEvent.Result>() {
                  @Override
                  protected PlayerPreLoginEvent.Result evaluate() {
-@@ -387,11 +397,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -392,11 +402,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
 
              ServerLoginPacketListenerImpl.this.server.processQueue.add(waitable);
              if (waitable.get() != PlayerPreLoginEvent.Result.ALLOWED) {
@@ -75,7 +75,7 @@ index b0f7a378f19b9837c060c891002cd5db756cdae1..025a3f18e521d65ddc924575c153e814
          }
          return gameprofile; // Paper - Add more fields to AsyncPlayerPreLoginEvent
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1bda8de29da69d4c8447f4841e1ec555e6921513..c24583b780b92faf38b61c45b4c941bdf5caba38 100644
+index d595113472426382f197efff3f9e18a2bbbc3f91..39c998d3ed782a9b65b4ea6f9ccbe6a46e78997a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -753,7 +753,7 @@ public abstract class PlayerList {