update upstream

gommehdnet · Dec 17, 2023 · a12caf0 · a12caf0
1 parent dedad5d
commit a12caf0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 26 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.gommehd.cheetah
 version=1.20.4-R0.1-SNAPSHOT
 
 mcVersion=1.20.4
-paperRef=0fadaed0783782877502a24fac53a63753959191
+paperRef=de04cbced5441dfa9847b02ab28fe7c4b54f054c
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 170a915098f09ace226648da342a04c5c7583d11..60a56a3d8251cf1460f4b2c28a4917e2e95f0842 100644
+index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..2e93daf93677cf740b32e8b68a00256128f9542b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -27,8 +27,12 @@ repositories {
@@ -55,10 +55,10 @@ index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..4b2282f621259a0173c114111524d7e2
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 782bb8ca67517dde5dba8f0a133eb8699353dd01..afa5d77e39303618f2cbff022eb60d2d1191780b 100644
+index e011cfcdda2e0a609d4158b0454bdf046b04c9d9..e9ec7bd1714f55182b4e38054f9cd23b99a410b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -270,7 +270,7 @@ import javax.annotation.Nullable; // Paper
+@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {

diff --git a/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch b/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch
@@ -36,10 +36,10 @@ index 2f058cec80c6ef7a5a5ca065dc6c9fe353c521de..dc9f4ccab5d70e45a34a0ca71ecdfc18
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f5a5ae30dfba21d5cf3990c046cfe41547e8a87a..e67e9b9effc5e1ea075f92c215cb64838e5ddcf0 100644
+index f67ec3f5f4b7e2f678609f2387cc8afa2adce161..90e8085b7036c2748571d70409ee118a98a1f776 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -16,6 +16,8 @@ import java.util.Map;
+@@ -15,6 +15,8 @@ import java.util.Map;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
@@ -48,7 +48,7 @@ index f5a5ae30dfba21d5cf3990c046cfe41547e8a87a..e67e9b9effc5e1ea075f92c215cb6483
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
-@@ -1510,7 +1512,8 @@ public class CraftEventFactory {
+@@ -1507,7 +1509,8 @@ public class CraftEventFactory {
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
 
          if (projectile.getShooter() instanceof Player && collided instanceof Player) {
@@ -58,7 +58,7 @@ index f5a5ae30dfba21d5cf3990c046cfe41547e8a87a..e67e9b9effc5e1ea075f92c215cb6483
                  event.setCancelled(true);
                  return event;
              }
-@@ -1521,6 +1524,15 @@ public class CraftEventFactory {
+@@ -1518,6 +1521,15 @@ public class CraftEventFactory {
      }
      // Paper end
 

diff --git a/patches/server/0006-support-case-insensitive-commands.patch b/patches/server/0006-support-case-insensitive-commands.patch
@@ -8,7 +8,7 @@ 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 9073db9ad3627633f46314ae936d584fa400a9ce..90d0142f0f89e462641a0f90dec39f430ed737ea 100644
+index 30ccbab1586a656e0ae41d7406525fb02d9e025b..46f99886fe75fddae15b0562c08ccbe38a086039 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2255,10 +2255,21 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -35,10 +35,10 @@ index 9073db9ad3627633f46314ae936d584fa400a9ce..90d0142f0f89e462641a0f90dec39f43
 
      private Optional<LastSeenMessages> tryHandleChat(LastSeenMessages.Update acknowledgment) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 3453eccf524d58c25f09b7a9772da703b85f4865..72c0dabd385d3e8a51fc6975e6bf98b7fedd6b19 100644
+index 11d7471faf35339b290b5b90c7db595e4813deb7..8c714f6e273d0f9f78d3972fbefd0f9181805850 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-@@ -53,7 +53,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
+@@ -51,7 +51,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
          Preconditions.checkArgument(alias != null, "Alias cannot be null");
 
          CommandSourceStack icommandlistener = VanillaCommandWrapper.getListener(sender);

diff --git a/patches/server/0016-fix-some-scoreboard-issues.patch b/patches/server/0016-fix-some-scoreboard-issues.patch
@@ -38,18 +38,3 @@ index be020d6b686c1ad5bd8b7cee0b6050304d434022..77c109e3e8ca9210f232d525338dccc4
 +    }
 +    // Cheetah end
  }
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-index 81889e30a634ac84d996f688d0a2466e9efa19ca..475c56eda326dc8bba582f9653362fd15ee68112 100644
---- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-@@ -223,8 +223,8 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
-     @Override
-     public ImmutableSet<String> getEntries() {
-         ImmutableSet.Builder<String> entries = ImmutableSet.builder();
--        for (Object entry : this.board.getTrackedPlayers()) {
--            entries.add(entry.toString());
-+        for (ScoreHolder entry : this.board.getTrackedPlayers()) {
-+            entries.add(entry.getScoreboardName());
-         }
-         return entries.build();
-     }