Update Paper

LeavesMC · Jul 17, 2023 · 3584bce · 3584bce
1 parent 76d7260
commit 3584bce
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ version=1.20.1-R0.1-SNAPSHOT
 mcVersion=1.20.1
 packageVersion=1_20_R1
 org.gradle.jvmargs=-Xmx2G
-paperRef=a3c760e6af1e8c7244ef75c6da6e6df278a79e14
+paperRef=c793bd93be69918d26ff53764a1fee2254cc1618
 preVersion=false
diff --git a/patches/server/0021-Optimize-entity-coordinate-key.patch b/patches/server/0021-Optimize-entity-coordinate-key.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize entity coordinate key
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 2d11a67bdc82088abf0b3ca134f352f155c8eb1f..e664a86efd456ca1a2165940df7a984b7387916b 100644
+index cb4379268b191d331c71be44642baac381ffaaf6..f5db4e41b9f3d90138076e8b30a81e4c22497136 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -210,7 +210,13 @@ public final class MCUtil {
+@@ -211,7 +211,13 @@ public final class MCUtil {
      }
 
      public static long getCoordinateKey(final Entity entity) {
@@ -25,7 +25,7 @@ index 2d11a67bdc82088abf0b3ca134f352f155c8eb1f..e664a86efd456ca1a2165940df7a984b
 
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8a30a18a24986f0c54483f69410e5dace4e4ca38..e7a5e07deb24d6d9ad0b4aa92fc0bef3249d0845 100644
+index 0d59e39b321f0fb4fdd927f5bf2eed3b70d72aaf..531046d494328dda8f0333470e18840f3391b8e6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

diff --git a/patches/server/0030-Config-to-disable-method-profiler.patch b/patches/server/0030-Config-to-disable-method-profiler.patch
@@ -22,10 +22,10 @@ index 307d4fd4b52aa654f859aab34126048b6a127dde..755f0d3631b733799d2cb07a22b0bed8
      }
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 11d362ce8043966a7fce6c64849b7c080133fcbd..71836aa0e2f5d397c0b02c9662d1b11454c0388b 100644
+index a34edc362d2430ae2b55607d92d56eaa2f9ac2e4..e512157222f84af9cda498d3bf598dea4f96d2a8 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1474,6 +1474,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1475,6 +1475,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
 
      public ProfilerFiller getProfiler() {

diff --git a/patches/server/0043-PCA-sync-protocol.patch b/patches/server/0043-PCA-sync-protocol.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d698758400fb0a8edc057a215c080978c3ba2211..527f3ff0ff48582fad63fdde7612d250913c10ef 100644
+index 3dc5b2f10702ca675fa947b96c341ebb20097118..90d4c8fa4c9715b317410201e21ba57cff901f7b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -245,6 +245,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -17,7 +17,7 @@ index d698758400fb0a8edc057a215c080978c3ba2211..527f3ff0ff48582fad63fdde7612d250
  // CraftBukkit end
 
  public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
-@@ -3548,6 +3549,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3555,6 +3556,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
              }
          } else {

diff --git a/patches/server/0044-BBOR-Protocol.patch b/patches/server/0044-BBOR-Protocol.patch
@@ -18,10 +18,10 @@ index 755f0d3631b733799d2cb07a22b0bed8a7ab9e9d..e7f1e2440c067ebf8c1c2d175d413de6
          for (int i = 0; i < this.tickables.size(); ++i) {
              ((Runnable) this.tickables.get(i)).run();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 527f3ff0ff48582fad63fdde7612d250913c10ef..0a2cb031a3a4ed0ba7a62c782a737cb02207f8dd 100644
+index 90d4c8fa4c9715b317410201e21ba57cff901f7b..74f74d5f898875a50ee66c279854a0d263f6eccf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3554,6 +3554,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3561,6 +3561,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.pcaSyncProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.PcaSyncProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.PcaSyncProtocol.handlePacket(server, player, packet);
                  }

diff --git a/patches/server/0047-Jade-Protocol.patch b/patches/server/0047-Jade-Protocol.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Jade Protocol
 This patch is Powered by Jade(https://github.com/Snownee/Jade)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0a2cb031a3a4ed0ba7a62c782a737cb02207f8dd..35295d8577acf11bd701ef2a7aa1bab3784c7274 100644
+index 74f74d5f898875a50ee66c279854a0d263f6eccf..066a044e721b82d908d22528141cdc504343e6b5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3557,6 +3557,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3564,6 +3564,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.bborProtocol && packet.identifier.equals(top.leavesmc.leaves.protocol.BBORProtocol.SUBSCRIBE)) {
                      top.leavesmc.leaves.protocol.BBORProtocol.onPlayerSubscribed(player);
                  }

diff --git a/patches/server/0061-Syncmatica-Protocol.patch b/patches/server/0061-Syncmatica-Protocol.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Syncmatica Protocol
 This patch is Powered by Syncmatica(https://github.com/End-Tech/syncmatica)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 35295d8577acf11bd701ef2a7aa1bab3784c7274..16433351834ec562debcc1062ad1c0cf1d4b4d06 100644
+index 066a044e721b82d908d22528141cdc504343e6b5..97d8c056bbb77d01b3d87f29fefd5fc11051a6e0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -322,6 +322,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -43,7 +43,7 @@ index 35295d8577acf11bd701ef2a7aa1bab3784c7274..16433351834ec562debcc1062ad1c0cf
          this.chatMessageChain.close();
          ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString());
          // CraftBukkit start - Replace vanilla quit message handling with our own.
-@@ -3560,6 +3573,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3567,6 +3580,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.jadeProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.JadeProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.JadeProtocol.handlePacket(server, player, packet);
                  }

diff --git a/patches/server/0070-Leaves-carpet-support.patch b/patches/server/0070-Leaves-carpet-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves carpet support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9ad3dbb4b376b04ddc9729bf46185d9aafa45891..6d40c0b3fbccaa86207603f38b073f36df3880e6 100644
+index e30b9fec7a9e405433889eb4439056a9f4847791..4f9b13c8c3add6ce08deed2bc6788ec00b0112ea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3576,6 +3576,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3583,6 +3583,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.syncmaticaProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.getCommunicationManager().onPacketGet(packet, this);
                  }
@@ -31,7 +31,7 @@ index 6c19d9b64830efe4b9d6f17d8ca92f88ad3475d5..fb6810289ac855e622d3970101f27b21
          final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
 
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 4a7fa92d4f5bce5cbead17a5a5579a96a84dafad..d5f5a9f61a4a030246c12bf48c93139196475540 100644
+index 5db4a3687f05bdc1ab3da0e74536dc8f72c7c1b5..41ecc020ee1277dc6af126a3531901567ce8217b 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -15,6 +15,8 @@ import top.leavesmc.leaves.bot.agent.Actions;

diff --git a/patches/server/0078-Bladeren-mspt-sync-protocol.patch b/patches/server/0078-Bladeren-mspt-sync-protocol.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bladeren mspt sync protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b8fd91fc1ebaafad28cfa08d5af71aa3b1c54da4..f393f9ae4465b8970122b2707290cac4350ac473 100644
+index ac236dd4c288d21d4689d1e37eca5a5922cf95c2..9bd10bf6877852b684cb3dbfa1cc426aa4ab3df6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1610,6 +1610,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,10 +17,10 @@ index b8fd91fc1ebaafad28cfa08d5af71aa3b1c54da4..f393f9ae4465b8970122b2707290cac4
          MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
          for (int i = 0; i < this.tickables.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c1250c4cb331f3ac8fed0f9ffda8b4eab529f668..e738d0178d7c19c09e77ac4452a02d347743990e 100644
+index f4e49ff40afa4f15b574867e8f607109ddc4e972..77f20c1e37ce6c271a7f060bab04324d6b748136 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3579,6 +3579,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3586,6 +3586,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.leavesCarpetSupport && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.CarpetServerProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.CarpetServerProtocol.handlePacket(player, packet);
                  }