diff --git a/patches/server/0006-Leaves-Protocol-Core.patch b/patches/server/0006-Leaves-Protocol-Core.patch index 77bb001c..733c8e91 100644 --- a/patches/server/0006-Leaves-Protocol-Core.patch +++ b/patches/server/0006-Leaves-Protocol-Core.patch @@ -120,10 +120,10 @@ index 0000000000000000000000000000000000000000..64a1d25973b032e8cab64bbffa6824a1 +} diff --git a/src/main/java/top/leavesmc/leaves/protocol/core/LeavesProtocolManager.java b/src/main/java/top/leavesmc/leaves/protocol/core/LeavesProtocolManager.java new file mode 100644 -index 0000000000000000000000000000000000000000..00a259a8f462aaa591c335bcbb91aee45cefaff4 +index 0000000000000000000000000000000000000000..eb8bec80870bbe8a6b6aea324376485875a30d00 --- /dev/null +++ b/src/main/java/top/leavesmc/leaves/protocol/core/LeavesProtocolManager.java -@@ -0,0 +1,280 @@ +@@ -0,0 +1,292 @@ +package top.leavesmc.leaves.protocol.core; + +import net.minecraft.network.FriendlyByteBuf; @@ -342,11 +342,11 @@ index 0000000000000000000000000000000000000000..00a259a8f462aaa591c335bcbb91aee4 + for (ProtocolHandler.MinecraftRegister register : MINECRAFT_REGISTER.keySet()) { + if (register.ignoreId() || register.channelId().equals(channel) || + ArrayUtils.contains(register.channelIds(), channel)) { -+ try { ++ try { + MINECRAFT_REGISTER.get(register).invoke(player); -+ } catch (InvocationTargetException | IllegalAccessException e) { -+ e.printStackTrace(); -+ } ++ } catch (InvocationTargetException | IllegalAccessException e) { ++ e.printStackTrace(); ++ } + } + } + } @@ -395,14 +395,26 @@ index 0000000000000000000000000000000000000000..00a259a8f462aaa591c335bcbb91aee4 + + public record EmptyPayload(ResourceLocation id) implements CustomPacketPayload { + -+ public EmptyPayload(ResourceLocation id, FriendlyByteBuf buf) { -+ this(id); ++ public EmptyPayload(ResourceLocation location, FriendlyByteBuf buf) { ++ this(location); + } + + @Override + public void write(@NotNull FriendlyByteBuf buf) { + } + } ++ ++ public record LeavesPayload(FriendlyByteBuf data, ResourceLocation id) implements CustomPacketPayload { ++ ++ public LeavesPayload(ResourceLocation location, FriendlyByteBuf buf) { ++ this(new FriendlyByteBuf(buf.readBytes(buf.readableBytes())), location); ++ } ++ ++ @Override ++ public void write(FriendlyByteBuf buf) { ++ buf.writeBytes(data); ++ } ++ } +} diff --git a/src/main/java/top/leavesmc/leaves/protocol/core/ProtocolHandler.java b/src/main/java/top/leavesmc/leaves/protocol/core/ProtocolHandler.java new file mode 100644 diff --git a/patches/unapplied/0058-Syncmatica-Protocol.patch b/patches/server/0060-Syncmatica-Protocol.patch similarity index 95% rename from patches/unapplied/0058-Syncmatica-Protocol.patch rename to patches/server/0060-Syncmatica-Protocol.patch index ff999f59..877bff96 100644 --- a/patches/unapplied/0058-Syncmatica-Protocol.patch +++ b/patches/server/0060-Syncmatica-Protocol.patch @@ -6,24 +6,19 @@ 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 7b0e956b11817c08b42ee3a7db87d42a090f5b15..6775fbfe4051ae639f753d618fc6d5a17db2326b 100644 +index 72cfca4a310f7714c7e22be312175e7435051397..67431477762c1744a4604d5d1f59f1172be0244e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -324,6 +324,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -310,6 +310,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl + player.getTextFilter().join(); + this.signedMessageDecoder = server.enforceSecureProfile() ? SignedMessageChain.Decoder.REJECT_ALL : SignedMessageChain.Decoder.unsigned(player.getUUID()); this.chatMessageChain = new FutureChain(server.chatExecutor); // CraftBukkit - async chat - // CraftBukkit start - add fields and methods - this.cserver = server.server; -+ // Leaves start - Syncmatica Protocol -+ this.exchangeTarget = new top.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget(this); -+ if (top.leavesmc.leaves.LeavesConfig.syncmaticaProtocol) { -+ top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.getCommunicationManager().onPlayerJoin(exchangeTarget, player); -+ } -+ // Leaves end - Syncmatica Protocol ++ this.exchangeTarget = new top.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget(this); // Leaves - Syncmatica Protocol } - private final org.bukkit.craftbukkit.CraftServer cserver; -@@ -348,6 +354,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic - } + // CraftBukkit start - add fields +@@ -329,6 +330,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl + private boolean hasMoved; // Spigot // CraftBukkit end + public final top.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget exchangeTarget; // Leaves - Syncmatica Protocol @@ -31,30 +26,8 @@ index 7b0e956b11817c08b42ee3a7db87d42a090f5b15..6775fbfe4051ae639f753d618fc6d5a1 @Override public void tick() { if (this.ackBlockChangesUpTo > -1) { -@@ -2166,6 +2174,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic - this.processedDisconnect = true; - } - // CraftBukkit end -+ // Leaves start - Syncmatica Protocol -+ if (top.leavesmc.leaves.LeavesConfig.syncmaticaProtocol) { -+ top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.getCommunicationManager().onPlayerLeave(exchangeTarget); -+ } -+ // Leaves end - Syncmatica Protocol - this.chatMessageChain.close(); - ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString()); - // CraftBukkit start - Replace vanilla quit message handling with our own. -@@ -3626,6 +3639,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); - } -+ 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); -+ } - } catch (Exception ex) { - ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); - this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index f0e28ad726fd9de56df7fcf78f18309e744a626f..a60c13ddbc4e9147324e8442ff48974f6dd35dbf 100644 +index db6b7ff06bf646aa50afadc354b381821cb5b1a9..7a1fae214f7ed5c664459665f43011c84e6b6259 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -12,6 +12,7 @@ import top.leavesmc.leaves.command.LeavesCommand; @@ -75,10 +48,10 @@ index f0e28ad726fd9de56df7fcf78f18309e744a626f..a60c13ddbc4e9147324e8442ff48974f diff --git a/src/main/java/top/leavesmc/leaves/protocol/syncmatica/CommunicationManager.java b/src/main/java/top/leavesmc/leaves/protocol/syncmatica/CommunicationManager.java new file mode 100644 -index 0000000000000000000000000000000000000000..5320948762a791bcdda915f842ce139516b09657 +index 0000000000000000000000000000000000000000..747da005acc37d8c1f8adec0d707afab1b5fc352 --- /dev/null +++ b/src/main/java/top/leavesmc/leaves/protocol/syncmatica/CommunicationManager.java -@@ -0,0 +1,382 @@ +@@ -0,0 +1,391 @@ +package top.leavesmc.leaves.protocol.syncmatica; + +import com.mojang.authlib.GameProfile; @@ -86,13 +59,16 @@ index 0000000000000000000000000000000000000000..5320948762a791bcdda915f842ce1395 +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.chat.Component; -+import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket; ++import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.ServerGamePacketListenerImpl; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.Rotation; +import org.jetbrains.annotations.NotNull; ++import top.leavesmc.leaves.protocol.core.LeavesProtocol; ++import top.leavesmc.leaves.protocol.core.LeavesProtocolManager; ++import top.leavesmc.leaves.protocol.core.ProtocolHandler; +import top.leavesmc.leaves.protocol.syncmatica.exchange.DownloadExchange; +import top.leavesmc.leaves.protocol.syncmatica.exchange.Exchange; +import top.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget; @@ -111,6 +87,7 @@ index 0000000000000000000000000000000000000000..5320948762a791bcdda915f842ce1395 +import java.util.Map; +import java.util.UUID; + ++@LeavesProtocol(namespace = "syncmatica") +public class CommunicationManager { + + private final Map> downloadingFile = new HashMap<>(); @@ -143,7 +120,9 @@ index 0000000000000000000000000000000000000000..5320948762a791bcdda915f842ce1395 + } + } + -+ public void onPlayerJoin(final ExchangeTarget newPlayer, final ServerPlayer player) { ++ @ProtocolHandler.PlayerJoin ++ public void onPlayerJoin(ServerPlayer player) { ++ final ExchangeTarget newPlayer = player.connection.exchangeTarget; + final VersionHandshakeServer hi = new VersionHandshakeServer(newPlayer); + playerMap.put(newPlayer, player); + final GameProfile profile = player.getGameProfile(); @@ -151,7 +130,9 @@ index 0000000000000000000000000000000000000000..5320948762a791bcdda915f842ce1395 + startExchangeUnchecked(hi); + } + -+ public void onPlayerLeave(final @NotNull ExchangeTarget oldPlayer) { ++ @ProtocolHandler.PlayerLeave ++ public void onPlayerLeave(ServerPlayer player) { ++ final ExchangeTarget oldPlayer = player.connection.exchangeTarget; + final Collection potentialMessageTarget = oldPlayer.getExchanges(); + if (potentialMessageTarget != null) { + for (final Exchange target : potentialMessageTarget) { @@ -163,8 +144,9 @@ index 0000000000000000000000000000000000000000..5320948762a791bcdda915f842ce1395 + playerMap.remove(oldPlayer); + } + -+ public void onPacketGet(final @NotNull ServerboundCustomPayloadPacket packet, final @NotNull ServerGamePacketListenerImpl impl) { -+ onPacket(impl.exchangeTarget, packet.identifier, packet.data); ++ @ProtocolHandler.PayloadReceiver(payload = LeavesProtocolManager.LeavesPayload.class, ignoreId = true) ++ public void onPacketGet(ServerPlayer player, LeavesProtocolManager.LeavesPayload payload) { ++ onPacket(player.connection.exchangeTarget, payload.id(), payload.data()); + } + + public void onPacket(final @NotNull ExchangeTarget source, final ResourceLocation id, final FriendlyByteBuf packetBuf) { @@ -1694,16 +1676,16 @@ index 0000000000000000000000000000000000000000..26482e63b7c24c80bdc111cea51b8d7b +} diff --git a/src/main/java/top/leavesmc/leaves/protocol/syncmatica/exchange/ExchangeTarget.java b/src/main/java/top/leavesmc/leaves/protocol/syncmatica/exchange/ExchangeTarget.java new file mode 100644 -index 0000000000000000000000000000000000000000..eae6aab5cb02ea167ebfbfcb5e3f20f933ee6d39 +index 0000000000000000000000000000000000000000..706680a3d7fae22f94cb86b8da2e306cfcf4cb1b --- /dev/null +++ b/src/main/java/top/leavesmc/leaves/protocol/syncmatica/exchange/ExchangeTarget.java -@@ -0,0 +1,38 @@ +@@ -0,0 +1,40 @@ +package top.leavesmc.leaves.protocol.syncmatica.exchange; + +import net.minecraft.network.FriendlyByteBuf; -+import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.network.ServerGamePacketListenerImpl; ++import top.leavesmc.leaves.protocol.core.ProtocolUtils; +import top.leavesmc.leaves.protocol.syncmatica.FeatureSet; + +import java.util.ArrayList; @@ -1721,7 +1703,9 @@ index 0000000000000000000000000000000000000000..eae6aab5cb02ea167ebfbfcb5e3f20f9 + } + + public void sendPacket(final ResourceLocation id, final FriendlyByteBuf packetBuf) { -+ client.send(new ClientboundCustomPayloadPacket(id, packetBuf)); ++ ProtocolUtils.sendPayloadPacket(client.player, id, buf -> { ++ buf.writeBytes(packetBuf); ++ }); + } + + public FeatureSet getFeatureSet() { diff --git a/patches/server/0060-Disable-distance-check-for-UseItemOnPacket.patch b/patches/server/0061-Disable-distance-check-for-UseItemOnPacket.patch similarity index 88% rename from patches/server/0060-Disable-distance-check-for-UseItemOnPacket.patch rename to patches/server/0061-Disable-distance-check-for-UseItemOnPacket.patch index 1a84dc11..687d5abe 100644 --- a/patches/server/0060-Disable-distance-check-for-UseItemOnPacket.patch +++ b/patches/server/0061-Disable-distance-check-for-UseItemOnPacket.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 72cfca4a310f7714c7e22be312175e7435051397..209511eb52fe815e7387bd2bf37497748af00119 100644 +index 67431477762c1744a4604d5d1f59f1172be0244e..574f5c06bd9c30b45534949e4e289e9ed8e55b47 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1901,7 +1901,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1904,7 +1904,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl Vec3 vec3d2 = vec3d.subtract(vec3d1); double d0 = 1.0000001D; diff --git a/patches/server/0061-No-feather-falling-trample.patch b/patches/server/0062-No-feather-falling-trample.patch similarity index 100% rename from patches/server/0061-No-feather-falling-trample.patch rename to patches/server/0062-No-feather-falling-trample.patch diff --git a/patches/server/0062-Shared-villager-discounts.patch b/patches/server/0063-Shared-villager-discounts.patch similarity index 100% rename from patches/server/0062-Shared-villager-discounts.patch rename to patches/server/0063-Shared-villager-discounts.patch diff --git a/patches/server/0063-Redstone-wire-dont-connect-if-on-trapdoor.patch b/patches/server/0064-Redstone-wire-dont-connect-if-on-trapdoor.patch similarity index 100% rename from patches/server/0063-Redstone-wire-dont-connect-if-on-trapdoor.patch rename to patches/server/0064-Redstone-wire-dont-connect-if-on-trapdoor.patch diff --git a/patches/server/0064-Disable-check-out-of-order-command.patch b/patches/server/0065-Disable-check-out-of-order-command.patch similarity index 90% rename from patches/server/0064-Disable-check-out-of-order-command.patch rename to patches/server/0065-Disable-check-out-of-order-command.patch index 5701a104..9f4472a9 100644 --- a/patches/server/0064-Disable-check-out-of-order-command.patch +++ b/patches/server/0065-Disable-check-out-of-order-command.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable check out-of-order command diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 209511eb52fe815e7387bd2bf37497748af00119..8b072958aca8215e58e54fb2e64855b7632fbbf6 100644 +index 574f5c06bd9c30b45534949e4e289e9ed8e55b47..d6c9348d7e8989ebca5f9fe35915d9a5910162aa 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2244,7 +2244,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2247,7 +2247,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } private Optional tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) { diff --git a/patches/server/0065-Despawn-enderman-with-block.patch b/patches/server/0066-Despawn-enderman-with-block.patch similarity index 100% rename from patches/server/0065-Despawn-enderman-with-block.patch rename to patches/server/0066-Despawn-enderman-with-block.patch diff --git a/patches/server/0066-Leaves-carpet-support.patch b/patches/server/0067-Leaves-carpet-support.patch similarity index 95% rename from patches/server/0066-Leaves-carpet-support.patch rename to patches/server/0067-Leaves-carpet-support.patch index 89f4e81a..c2cb9afb 100644 --- a/patches/server/0066-Leaves-carpet-support.patch +++ b/patches/server/0067-Leaves-carpet-support.patch @@ -5,19 +5,19 @@ Subject: [PATCH] Leaves carpet support diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index db6b7ff06bf646aa50afadc354b381821cb5b1a9..af17de2dcadcfe3b0706c8c04fc804c520d1e83d 100644 +index 7a1fae214f7ed5c664459665f43011c84e6b6259..79e3e4ae09d29134219485800d8d9efc91d9ce6b 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -@@ -13,6 +13,8 @@ import top.leavesmc.leaves.bot.BotCommand; - import top.leavesmc.leaves.bot.agent.Actions; +@@ -14,6 +14,8 @@ import top.leavesmc.leaves.bot.agent.Actions; import top.leavesmc.leaves.profile.LeavesMinecraftSessionService; + import top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol; import top.leavesmc.leaves.util.MathUtils; +import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRule; +import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRules; import java.io.File; import java.lang.reflect.InvocationTargetException; -@@ -607,6 +609,8 @@ public final class LeavesConfig { +@@ -609,6 +611,8 @@ public final class LeavesConfig { } public static void registerCarpetRules() { diff --git a/patches/server/0067-Creative-fly-no-clip.patch b/patches/server/0068-Creative-fly-no-clip.patch similarity index 100% rename from patches/server/0067-Creative-fly-no-clip.patch rename to patches/server/0068-Creative-fly-no-clip.patch diff --git a/patches/server/0068-Optimized-dragon-respawn.patch b/patches/server/0069-Optimized-dragon-respawn.patch similarity index 100% rename from patches/server/0068-Optimized-dragon-respawn.patch rename to patches/server/0069-Optimized-dragon-respawn.patch diff --git a/patches/server/0069-Enchantment-mending-compatibility-infinity.patch b/patches/server/0070-Enchantment-mending-compatibility-infinity.patch similarity index 100% rename from patches/server/0069-Enchantment-mending-compatibility-infinity.patch rename to patches/server/0070-Enchantment-mending-compatibility-infinity.patch diff --git a/patches/server/0070-Shave-snow-layers.patch b/patches/server/0071-Shave-snow-layers.patch similarity index 100% rename from patches/server/0070-Shave-snow-layers.patch rename to patches/server/0071-Shave-snow-layers.patch diff --git a/patches/server/0071-Spawn-ignore-lc.patch b/patches/server/0072-Spawn-ignore-lc.patch similarity index 100% rename from patches/server/0071-Spawn-ignore-lc.patch rename to patches/server/0072-Spawn-ignore-lc.patch diff --git a/patches/server/0072-Elytra-aeronautics-no-chunk-load.patch b/patches/server/0073-Elytra-aeronautics-no-chunk-load.patch similarity index 98% rename from patches/server/0072-Elytra-aeronautics-no-chunk-load.patch rename to patches/server/0073-Elytra-aeronautics-no-chunk-load.patch index 7649082d..d4bfcb41 100644 --- a/patches/server/0072-Elytra-aeronautics-no-chunk-load.patch +++ b/patches/server/0073-Elytra-aeronautics-no-chunk-load.patch @@ -45,10 +45,10 @@ index ed2e0774d5b14d4926b3214ebf3795d7555327e3..0434bf9b8d3b064c8426d51f9969686a while (objectiterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8b072958aca8215e58e54fb2e64855b7632fbbf6..84c481fe696b4d1da2ef01692e9347d0a9a8ecae 100644 +index d6c9348d7e8989ebca5f9fe35915d9a5910162aa..6d03da4fee0e53ffffe12a36efe0e095498eac6f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -537,7 +537,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -540,7 +540,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl speed *= 2f; // TODO: Get the speed of the vehicle instead of the player // Paper start - Prevent moving into unloaded chunks diff --git a/patches/server/0073-Fix-Paper-9372.patch b/patches/server/0074-Fix-Paper-9372.patch similarity index 100% rename from patches/server/0073-Fix-Paper-9372.patch rename to patches/server/0074-Fix-Paper-9372.patch diff --git a/patches/server/0074-Cache-ignite-odds.patch b/patches/server/0075-Cache-ignite-odds.patch similarity index 100% rename from patches/server/0074-Cache-ignite-odds.patch rename to patches/server/0075-Cache-ignite-odds.patch diff --git a/patches/server/0075-Lava-riptide.patch b/patches/server/0076-Lava-riptide.patch similarity index 100% rename from patches/server/0075-Lava-riptide.patch rename to patches/server/0076-Lava-riptide.patch diff --git a/patches/server/0076-No-block-update-command.patch b/patches/server/0077-No-block-update-command.patch similarity index 97% rename from patches/server/0076-No-block-update-command.patch rename to patches/server/0077-No-block-update-command.patch index 7502e780..bdbbcd9f 100644 --- a/patches/server/0076-No-block-update-command.patch +++ b/patches/server/0077-No-block-update-command.patch @@ -92,7 +92,7 @@ index 2708251ebc1995e71fb0e5dca9e158a3005f8a8a..e28351b379677fec356b6efec2d882ee } } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index af17de2dcadcfe3b0706c8c04fc804c520d1e83d..3b8db2215f3000cd091a5c363ac4f25c01ddc26e 100644 +index 79e3e4ae09d29134219485800d8d9efc91d9ce6b..f378005cafe92f57e8264757b17eeb9d43b177aa 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration; @@ -101,9 +101,9 @@ index af17de2dcadcfe3b0706c8c04fc804c520d1e83d..3b8db2215f3000cd091a5c363ac4f25c import top.leavesmc.leaves.bot.agent.Actions; +import top.leavesmc.leaves.command.NoBlockUpdateCommand; import top.leavesmc.leaves.profile.LeavesMinecraftSessionService; + import top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol; import top.leavesmc.leaves.util.MathUtils; - import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRule; -@@ -82,6 +83,10 @@ public final class LeavesConfig { +@@ -83,6 +84,10 @@ public final class LeavesConfig { commands.put("bot", new BotCommand("bot")); Actions.registerAll(); } diff --git a/patches/server/0077-Raider-die-skip-self-raid-check.patch b/patches/server/0078-Raider-die-skip-self-raid-check.patch similarity index 100% rename from patches/server/0077-Raider-die-skip-self-raid-check.patch rename to patches/server/0078-Raider-die-skip-self-raid-check.patch diff --git a/patches/server/0078-Container-open-passthrough.patch b/patches/server/0079-Container-open-passthrough.patch similarity index 100% rename from patches/server/0078-Container-open-passthrough.patch rename to patches/server/0079-Container-open-passthrough.patch diff --git a/patches/server/0079-Bladeren-Protocol.patch b/patches/server/0080-Bladeren-Protocol.patch similarity index 96% rename from patches/server/0079-Bladeren-Protocol.patch rename to patches/server/0080-Bladeren-Protocol.patch index b516f5b7..260bb5e3 100644 --- a/patches/server/0079-Bladeren-Protocol.patch +++ b/patches/server/0080-Bladeren-Protocol.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Bladeren Protocol diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 3b8db2215f3000cd091a5c363ac4f25c01ddc26e..2c3becfa0e540ce1ae5a1357201666bbf3df665f 100644 +index f378005cafe92f57e8264757b17eeb9d43b177aa..38e6a4299e7664608b288ec4fff29f4979337544 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -@@ -16,6 +16,8 @@ import top.leavesmc.leaves.profile.LeavesMinecraftSessionService; +@@ -17,6 +17,8 @@ import top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol; import top.leavesmc.leaves.util.MathUtils; import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRule; import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRules; @@ -17,7 +17,7 @@ index 3b8db2215f3000cd091a5c363ac4f25c01ddc26e..2c3becfa0e540ce1ae5a1357201666bb import java.io.File; import java.lang.reflect.InvocationTargetException; -@@ -75,6 +77,7 @@ public final class LeavesConfig { +@@ -76,6 +78,7 @@ public final class LeavesConfig { LeavesConfig.load(config); registerCarpetRules(); @@ -25,7 +25,7 @@ index 3b8db2215f3000cd091a5c363ac4f25c01ddc26e..2c3becfa0e540ce1ae5a1357201666bb commands = new HashMap<>(); commands.put("leaves", new LeavesCommand("leaves")); -@@ -851,6 +854,10 @@ public final class LeavesConfig { +@@ -853,6 +856,10 @@ public final class LeavesConfig { } public static void registerLeavesFeatures() { diff --git a/patches/server/0080-Bladeren-mspt-sync-protocol.patch b/patches/server/0081-Bladeren-mspt-sync-protocol.patch similarity index 100% rename from patches/server/0080-Bladeren-mspt-sync-protocol.patch rename to patches/server/0081-Bladeren-mspt-sync-protocol.patch diff --git a/patches/server/0081-SIMD-support.patch b/patches/server/0082-SIMD-support.patch similarity index 100% rename from patches/server/0081-SIMD-support.patch rename to patches/server/0082-SIMD-support.patch diff --git a/patches/server/0082-Dont-respond-ping-before-start-fully.patch b/patches/server/0083-Dont-respond-ping-before-start-fully.patch similarity index 100% rename from patches/server/0082-Dont-respond-ping-before-start-fully.patch rename to patches/server/0083-Dont-respond-ping-before-start-fully.patch diff --git a/patches/server/0083-Faster-chunk-serialization.patch b/patches/server/0084-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0083-Faster-chunk-serialization.patch rename to patches/server/0084-Faster-chunk-serialization.patch diff --git a/patches/server/0084-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0085-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0084-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0085-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0085-Cache-world-generator-sea-level.patch b/patches/server/0086-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0085-Cache-world-generator-sea-level.patch rename to patches/server/0086-Cache-world-generator-sea-level.patch diff --git a/patches/server/0086-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0087-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0086-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0087-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0087-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0088-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0087-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0088-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0088-Store-mob-counts-in-an-array.patch b/patches/server/0089-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0088-Store-mob-counts-in-an-array.patch rename to patches/server/0089-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0089-Cache-BlockStatePairKey-hash.patch b/patches/server/0090-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0089-Cache-BlockStatePairKey-hash.patch rename to patches/server/0090-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0090-Optimize-noise-generation.patch b/patches/server/0091-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0090-Optimize-noise-generation.patch rename to patches/server/0091-Optimize-noise-generation.patch diff --git a/patches/server/0091-Disable-packet-limit.patch b/patches/server/0092-Disable-packet-limit.patch similarity index 100% rename from patches/server/0091-Disable-packet-limit.patch rename to patches/server/0092-Disable-packet-limit.patch diff --git a/patches/server/0092-Reduce-array-allocations.patch b/patches/server/0093-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0092-Reduce-array-allocations.patch rename to patches/server/0093-Reduce-array-allocations.patch index ba4e6885..9276a1bb 100644 --- a/patches/server/0092-Reduce-array-allocations.patch +++ b/patches/server/0093-Reduce-array-allocations.patch @@ -257,7 +257,7 @@ index c0ebba04b41628f691ab55853498df258549e939..8ce9c990d9db973ea2bb80a58fa9002a return ret; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 84c481fe696b4d1da2ef01692e9347d0a9a8ecae..5753f163a46ae86a45cc363d7656841f552e49b9 100644 +index 6d03da4fee0e53ffffe12a36efe0e095498eac6f..18e1845f3919d988d51ab7ba0a6eec6cd3a38df8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -239,6 +239,7 @@ import org.bukkit.inventory.EquipmentSlot; @@ -268,7 +268,7 @@ index 84c481fe696b4d1da2ef01692e9347d0a9a8ecae..5753f163a46ae86a45cc363d7656841f public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl implements ServerGamePacketListener, ServerPlayerConnection, TickablePacketListener { -@@ -776,13 +777,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -779,13 +780,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async // CraftBukkit start if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable @@ -284,7 +284,7 @@ index 84c481fe696b4d1da2ef01692e9347d0a9a8ecae..5753f163a46ae86a45cc363d7656841f return; } // Paper end -@@ -3191,7 +3192,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -3194,7 +3195,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl // Paper start if (!org.bukkit.Bukkit.isPrimaryThread()) { if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) { diff --git a/patches/server/0093-Optimize-sun-burn-tick.patch b/patches/server/0094-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0093-Optimize-sun-burn-tick.patch rename to patches/server/0094-Optimize-sun-burn-tick.patch diff --git a/patches/server/0094-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0095-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0094-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0095-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0095-Use-optimized-collection.patch b/patches/server/0096-Use-optimized-collection.patch similarity index 100% rename from patches/server/0095-Use-optimized-collection.patch rename to patches/server/0096-Use-optimized-collection.patch diff --git a/patches/server/0096-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0097-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0096-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0097-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0097-Optimized-CubePointRange.patch b/patches/server/0098-Optimized-CubePointRange.patch similarity index 100% rename from patches/server/0097-Optimized-CubePointRange.patch rename to patches/server/0098-Optimized-CubePointRange.patch diff --git a/patches/server/0098-Check-frozen-ticks-before-landing-block.patch b/patches/server/0099-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0098-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0099-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0099-Cache-ominous-banner-item.patch b/patches/server/0100-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0099-Cache-ominous-banner-item.patch rename to patches/server/0100-Cache-ominous-banner-item.patch diff --git a/patches/server/0100-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0101-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0100-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0101-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0101-Skip-cloning-advancement-criteria.patch b/patches/server/0102-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0101-Skip-cloning-advancement-criteria.patch rename to patches/server/0102-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0102-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0103-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0102-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0103-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0103-Fix-villagers-dont-release-memory.patch b/patches/server/0104-Fix-villagers-dont-release-memory.patch similarity index 100% rename from patches/server/0103-Fix-villagers-dont-release-memory.patch rename to patches/server/0104-Fix-villagers-dont-release-memory.patch diff --git a/patches/server/0104-Avoid-anvil-too-expensive.patch b/patches/server/0105-Avoid-anvil-too-expensive.patch similarity index 100% rename from patches/server/0104-Avoid-anvil-too-expensive.patch rename to patches/server/0105-Avoid-anvil-too-expensive.patch diff --git a/patches/server/0105-Bow-infinity-fix.patch b/patches/server/0106-Bow-infinity-fix.patch similarity index 100% rename from patches/server/0105-Bow-infinity-fix.patch rename to patches/server/0106-Bow-infinity-fix.patch diff --git a/patches/server/0106-Zero-tick-plants.patch b/patches/server/0107-Zero-tick-plants.patch similarity index 100% rename from patches/server/0106-Zero-tick-plants.patch rename to patches/server/0107-Zero-tick-plants.patch diff --git a/patches/server/0107-Leaves-update-command.patch b/patches/server/0108-Leaves-update-command.patch similarity index 100% rename from patches/server/0107-Leaves-update-command.patch rename to patches/server/0108-Leaves-update-command.patch diff --git a/patches/server/0108-Force-peaceful-mode-switch.patch b/patches/server/0109-Force-peaceful-mode-switch.patch similarity index 100% rename from patches/server/0108-Force-peaceful-mode-switch.patch rename to patches/server/0109-Force-peaceful-mode-switch.patch diff --git a/patches/server/0109-Add-Leaves-Auto-Update.patch b/patches/server/0110-Add-Leaves-Auto-Update.patch similarity index 95% rename from patches/server/0109-Add-Leaves-Auto-Update.patch rename to patches/server/0110-Add-Leaves-Auto-Update.patch index 8eb77d01..c417c302 100644 --- a/patches/server/0109-Add-Leaves-Auto-Update.patch +++ b/patches/server/0110-Add-Leaves-Auto-Update.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Leaves Auto Update diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 2c3becfa0e540ce1ae5a1357201666bbf3df665f..1d4d357465edf888f1d52755c382dcd8e015fc09 100644 +index 38e6a4299e7664608b288ec4fff29f4979337544..99192e8c41613fee3bbd432e55ac24f1178f3edc 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -@@ -16,6 +16,7 @@ import top.leavesmc.leaves.profile.LeavesMinecraftSessionService; +@@ -17,6 +17,7 @@ import top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol; import top.leavesmc.leaves.util.MathUtils; import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRule; import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRules; @@ -16,7 +16,7 @@ index 2c3becfa0e540ce1ae5a1357201666bbf3df665f..1d4d357465edf888f1d52755c382dcd8 import top.leavesmc.leaves.protocol.bladeren.BladerenProtocol.LeavesFeatureSet; import top.leavesmc.leaves.protocol.bladeren.BladerenProtocol.LeavesFeature; -@@ -823,6 +824,7 @@ public final class LeavesConfig { +@@ -825,6 +826,7 @@ public final class LeavesConfig { private static void autoUpdate() { autoUpdate = getBoolean("settings.misc.auto-update.enable", autoUpdate); autoUpdateTime = getList("settings.misc.auto-update.time", autoUpdateTime); diff --git a/patches/server/0110-Replay-Mod-API.patch b/patches/server/0111-Replay-Mod-API.patch similarity index 99% rename from patches/server/0110-Replay-Mod-API.patch rename to patches/server/0111-Replay-Mod-API.patch index 0ec81939..514db654 100644 --- a/patches/server/0110-Replay-Mod-API.patch +++ b/patches/server/0111-Replay-Mod-API.patch @@ -107,7 +107,7 @@ index fbd602b5219c0eeefea36dbaca7aae10d483a152..e05620a5fa75e22001511fff205b718b } // Leaves end - bot can't get advancement diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5753f163a46ae86a45cc363d7656841f552e49b9..e63455e3b0911c4b519ed3c3b8025c60f0a4c521 100644 +index 18e1845f3919d988d51ab7ba0a6eec6cd3a38df8..2072faea136e67ae34f52cb8dd9d00293097aaaa 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -300,7 +300,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0111-Leaves-tick-command.patch b/patches/server/0112-Leaves-tick-command.patch similarity index 100% rename from patches/server/0111-Leaves-tick-command.patch rename to patches/server/0112-Leaves-tick-command.patch diff --git a/patches/server/0112-Fix-vehicle-teleport-by-end-gateway.patch b/patches/server/0113-Fix-vehicle-teleport-by-end-gateway.patch similarity index 100% rename from patches/server/0112-Fix-vehicle-teleport-by-end-gateway.patch rename to patches/server/0113-Fix-vehicle-teleport-by-end-gateway.patch diff --git a/patches/server/0113-Leaves-I18n.patch b/patches/server/0114-Leaves-I18n.patch similarity index 100% rename from patches/server/0113-Leaves-I18n.patch rename to patches/server/0114-Leaves-I18n.patch diff --git a/patches/server/0114-Fix-minecraft-hopper-not-work-without-player.patch b/patches/server/0115-Fix-minecraft-hopper-not-work-without-player.patch similarity index 100% rename from patches/server/0114-Fix-minecraft-hopper-not-work-without-player.patch rename to patches/server/0115-Fix-minecraft-hopper-not-work-without-player.patch diff --git a/patches/server/0115-Wool-Hopper-Counter.patch b/patches/server/0116-Wool-Hopper-Counter.patch similarity index 100% rename from patches/server/0115-Wool-Hopper-Counter.patch rename to patches/server/0116-Wool-Hopper-Counter.patch diff --git a/patches/server/0116-Loot-world-random.patch b/patches/server/0117-Loot-world-random.patch similarity index 100% rename from patches/server/0116-Loot-world-random.patch rename to patches/server/0117-Loot-world-random.patch diff --git a/patches/server/0117-Leaves-Reload-Command.patch b/patches/server/0118-Leaves-Reload-Command.patch similarity index 100% rename from patches/server/0117-Leaves-Reload-Command.patch rename to patches/server/0118-Leaves-Reload-Command.patch diff --git a/patches/server/0118-Spider-jockeys-drop-gapples.patch b/patches/server/0119-Spider-jockeys-drop-gapples.patch similarity index 100% rename from patches/server/0118-Spider-jockeys-drop-gapples.patch rename to patches/server/0119-Spider-jockeys-drop-gapples.patch diff --git a/patches/server/0119-Force-Void-Trade.patch b/patches/server/0120-Force-Void-Trade.patch similarity index 100% rename from patches/server/0119-Force-Void-Trade.patch rename to patches/server/0120-Force-Void-Trade.patch diff --git a/patches/server/0120-Servux-Protocol.patch b/patches/server/0121-Servux-Protocol.patch similarity index 100% rename from patches/server/0120-Servux-Protocol.patch rename to patches/server/0121-Servux-Protocol.patch diff --git a/patches/server/0121-Villager-infinite-discounts.patch b/patches/server/0122-Villager-infinite-discounts.patch similarity index 91% rename from patches/server/0121-Villager-infinite-discounts.patch rename to patches/server/0122-Villager-infinite-discounts.patch index f5c50fab..84f53c6c 100644 --- a/patches/server/0121-Villager-infinite-discounts.patch +++ b/patches/server/0122-Villager-infinite-discounts.patch @@ -21,10 +21,10 @@ index c3d1d7b525a6f2b708144ebe9bc28dfadcfe11fa..55b4386fc57286548161f9ee91e19e22 private GossipType(String key, int multiplier, int maxReputation, int decay, int shareDecrement) { diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 1d4d357465edf888f1d52755c382dcd8e015fc09..dc15ec2edf4577e1a116f0fa7ecbfb63ba623aa6 100644 +index 99192e8c41613fee3bbd432e55ac24f1178f3edc..9a320d0452b9059614e7a58fdf86ec4bf8e02e50 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -@@ -19,6 +19,7 @@ import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRules; +@@ -20,6 +20,7 @@ import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRules; import top.leavesmc.leaves.util.LeavesUpdateHelper; import top.leavesmc.leaves.protocol.bladeren.BladerenProtocol.LeavesFeatureSet; import top.leavesmc.leaves.protocol.bladeren.BladerenProtocol.LeavesFeature; @@ -32,7 +32,7 @@ index 1d4d357465edf888f1d52755c382dcd8e015fc09..dc15ec2edf4577e1a116f0fa7ecbfb63 import java.io.File; import java.lang.reflect.InvocationTargetException; -@@ -896,6 +897,9 @@ public final class LeavesConfig { +@@ -898,6 +899,9 @@ public final class LeavesConfig { private static void villagerInfiniteDiscounts() { villagerInfiniteDiscounts = getBoolean("settings.modify.minecraft-old.villager-infinite-discounts", villagerInfiniteDiscounts); if (villagerInfiniteDiscounts) { diff --git a/patches/server/0122-CCE-update-suppression.patch b/patches/server/0123-CCE-update-suppression.patch similarity index 100% rename from patches/server/0122-CCE-update-suppression.patch rename to patches/server/0123-CCE-update-suppression.patch diff --git a/patches/server/0123-Disable-offline-warn-if-use-proxy.patch b/patches/server/0124-Disable-offline-warn-if-use-proxy.patch similarity index 100% rename from patches/server/0123-Disable-offline-warn-if-use-proxy.patch rename to patches/server/0124-Disable-offline-warn-if-use-proxy.patch diff --git a/patches/server/0124-Disable-moved-wrongly-threshold.patch b/patches/server/0125-Disable-moved-wrongly-threshold.patch similarity index 91% rename from patches/server/0124-Disable-moved-wrongly-threshold.patch rename to patches/server/0125-Disable-moved-wrongly-threshold.patch index 1751e3d7..af65aa30 100644 --- a/patches/server/0124-Disable-moved-wrongly-threshold.patch +++ b/patches/server/0125-Disable-moved-wrongly-threshold.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable moved wrongly threshold diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e63455e3b0911c4b519ed3c3b8025c60f0a4c521..e651dd7aadd16ae82f3352f0691f5530fd422e57 100644 +index 2072faea136e67ae34f52cb8dd9d00293097aaaa..813edf1e61bd75b044551c0cfdfdbf2433d3f309 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -583,7 +583,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -586,7 +586,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl d10 = d6 * d6 + d7 * d7 + d8 * d8; boolean flag2 = false; @@ -17,7 +17,7 @@ index e63455e3b0911c4b519ed3c3b8025c60f0a4c521..e651dd7aadd16ae82f3352f0691f5530 flag2 = true; // Paper - diff on change, this should be moved wrongly ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)}); } -@@ -1466,7 +1466,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1469,7 +1469,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl d10 = d6 * d6 + d7 * d7 + d8 * d8; boolean flag2 = false; diff --git a/patches/server/0125-Armor-stand-cant-kill-by-mob-projectile.patch b/patches/server/0126-Armor-stand-cant-kill-by-mob-projectile.patch similarity index 100% rename from patches/server/0125-Armor-stand-cant-kill-by-mob-projectile.patch rename to patches/server/0126-Armor-stand-cant-kill-by-mob-projectile.patch