From c2b3876dd85e4805bf7fa7f0cb3d986186f66f1b Mon Sep 17 00:00:00 2001 From: Cryptite Date: Sun, 21 Jan 2024 10:07:15 -0600 Subject: [PATCH] Drop patch --- ...n.patch => 0011-Disable-Azalea-generation.patch} | 0 ...Xray-Bypass.patch => 0012-AntiXray-Bypass.patch} | 0 ...patch => 0013-Add-PlayerPreChunkLoadEvent.patch} | 0 ...atch => 0014-Allow-opening-covered-chests.patch} | 0 ...-Don-t-send-fire-packets-if-player-has-FR.patch} | 0 ...patch => 0016-Allow-access-to-LightEngine.patch} | 0 ...able-geode-and-monsterspawners-generation.patch} | 0 ...> 0018-Set-Mutton-nutrition-equal-to-beef.patch} | 0 ...sEvent.patch => 0019-PlayerLoadStatsEvent.patch} | 0 ...-Force-Crit-to-PlayerPreAttackEntityEvent.patch} | 0 ...ing-KB-Bonus-to-PlayerPreAttackEntityEven.patch} | 0 ...tch => 0022-noEntityCollisions-for-Entity.patch} | 0 ...atch => 0023-Do-not-freeze-MappedRegistry.patch} | 0 ...025-Add-jackson.patch => 0024-Add-jackson.patch} | 0 ...string.patch => 0025-Maybe-can-t-tostring.patch} | 0 ... 0026-Allow-inventory-clicks-in-Spectator.patch} | 0 ... => 0027-Packet-obfuscation-and-reduction.patch} | 13 ------------- ...king.patch => 0028-Long-distance-tracking.patch} | 0 ...ng.patch => 0029-Equipment-Packet-Caching.patch} | 2 +- ...en.patch => 0030-Add-canDespawn-to-Warden.patch} | 0 ...-Add-reason-to-PlayerConnectionCloseEvent.patch} | 0 ....patch => 0032-Disable-feature-generation.patch} | 0 ...rride.patch => 0033-Biome-freeze-override.patch} | 0 ...l.patch => 0034-Change-KeepAlive-interval.patch} | 0 ...ities.patch => 0035-Non-saveable-entities.patch} | 0 ...vent.patch => 0036-ChunkStatusChangeEvent.patch} | 0 ...7-Disable-sending-Entity-Movement-Packets.patch} | 0 ...wnMobs.patch => 0038-Player-spawnsOwnMobs.patch} | 0 ...> 0039-Set-location-on-a-Custom-Inventory.patch} | 0 ...Storage.patch => 0040-Shared-Data-Storage.patch} | 0 .../server/{0042-Vanish.patch => 0041-Vanish.patch} | 0 31 files changed, 1 insertion(+), 14 deletions(-) rename patches/server/{0012-Disable-Azalea-generation.patch => 0011-Disable-Azalea-generation.patch} (100%) rename patches/server/{0013-AntiXray-Bypass.patch => 0012-AntiXray-Bypass.patch} (100%) rename patches/server/{0014-Add-PlayerPreChunkLoadEvent.patch => 0013-Add-PlayerPreChunkLoadEvent.patch} (100%) rename patches/server/{0015-Allow-opening-covered-chests.patch => 0014-Allow-opening-covered-chests.patch} (100%) rename patches/server/{0016-Don-t-send-fire-packets-if-player-has-FR.patch => 0015-Don-t-send-fire-packets-if-player-has-FR.patch} (100%) rename patches/server/{0017-Allow-access-to-LightEngine.patch => 0016-Allow-access-to-LightEngine.patch} (100%) rename patches/server/{0018-Disable-geode-and-monsterspawners-generation.patch => 0017-Disable-geode-and-monsterspawners-generation.patch} (100%) rename patches/server/{0019-Set-Mutton-nutrition-equal-to-beef.patch => 0018-Set-Mutton-nutrition-equal-to-beef.patch} (100%) rename patches/server/{0020-PlayerLoadStatsEvent.patch => 0019-PlayerLoadStatsEvent.patch} (100%) rename patches/server/{0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch => 0020-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch} (100%) rename patches/server/{0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch => 0021-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch} (100%) rename patches/server/{0023-noEntityCollisions-for-Entity.patch => 0022-noEntityCollisions-for-Entity.patch} (100%) rename patches/server/{0024-Do-not-freeze-MappedRegistry.patch => 0023-Do-not-freeze-MappedRegistry.patch} (100%) rename patches/server/{0025-Add-jackson.patch => 0024-Add-jackson.patch} (100%) rename patches/server/{0026-Maybe-can-t-tostring.patch => 0025-Maybe-can-t-tostring.patch} (100%) rename patches/server/{0027-Allow-inventory-clicks-in-Spectator.patch => 0026-Allow-inventory-clicks-in-Spectator.patch} (100%) rename patches/server/{0028-Packet-obfuscation-and-reduction.patch => 0027-Packet-obfuscation-and-reduction.patch} (91%) rename patches/server/{0029-Long-distance-tracking.patch => 0028-Long-distance-tracking.patch} (100%) rename patches/server/{0030-Equipment-Packet-Caching.patch => 0029-Equipment-Packet-Caching.patch} (99%) rename patches/server/{0031-Add-canDespawn-to-Warden.patch => 0030-Add-canDespawn-to-Warden.patch} (100%) rename patches/server/{0032-Add-reason-to-PlayerConnectionCloseEvent.patch => 0031-Add-reason-to-PlayerConnectionCloseEvent.patch} (100%) rename patches/server/{0033-Disable-feature-generation.patch => 0032-Disable-feature-generation.patch} (100%) rename patches/server/{0034-Biome-freeze-override.patch => 0033-Biome-freeze-override.patch} (100%) rename patches/server/{0035-Change-KeepAlive-interval.patch => 0034-Change-KeepAlive-interval.patch} (100%) rename patches/server/{0036-Non-saveable-entities.patch => 0035-Non-saveable-entities.patch} (100%) rename patches/server/{0037-ChunkStatusChangeEvent.patch => 0036-ChunkStatusChangeEvent.patch} (100%) rename patches/server/{0038-Disable-sending-Entity-Movement-Packets.patch => 0037-Disable-sending-Entity-Movement-Packets.patch} (100%) rename patches/server/{0039-Player-spawnsOwnMobs.patch => 0038-Player-spawnsOwnMobs.patch} (100%) rename patches/server/{0040-Set-location-on-a-Custom-Inventory.patch => 0039-Set-location-on-a-Custom-Inventory.patch} (100%) rename patches/server/{0041-Shared-Data-Storage.patch => 0040-Shared-Data-Storage.patch} (100%) rename patches/server/{0042-Vanish.patch => 0041-Vanish.patch} (100%) diff --git a/patches/server/0012-Disable-Azalea-generation.patch b/patches/server/0011-Disable-Azalea-generation.patch similarity index 100% rename from patches/server/0012-Disable-Azalea-generation.patch rename to patches/server/0011-Disable-Azalea-generation.patch diff --git a/patches/server/0013-AntiXray-Bypass.patch b/patches/server/0012-AntiXray-Bypass.patch similarity index 100% rename from patches/server/0013-AntiXray-Bypass.patch rename to patches/server/0012-AntiXray-Bypass.patch diff --git a/patches/server/0014-Add-PlayerPreChunkLoadEvent.patch b/patches/server/0013-Add-PlayerPreChunkLoadEvent.patch similarity index 100% rename from patches/server/0014-Add-PlayerPreChunkLoadEvent.patch rename to patches/server/0013-Add-PlayerPreChunkLoadEvent.patch diff --git a/patches/server/0015-Allow-opening-covered-chests.patch b/patches/server/0014-Allow-opening-covered-chests.patch similarity index 100% rename from patches/server/0015-Allow-opening-covered-chests.patch rename to patches/server/0014-Allow-opening-covered-chests.patch diff --git a/patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch b/patches/server/0015-Don-t-send-fire-packets-if-player-has-FR.patch similarity index 100% rename from patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch rename to patches/server/0015-Don-t-send-fire-packets-if-player-has-FR.patch diff --git a/patches/server/0017-Allow-access-to-LightEngine.patch b/patches/server/0016-Allow-access-to-LightEngine.patch similarity index 100% rename from patches/server/0017-Allow-access-to-LightEngine.patch rename to patches/server/0016-Allow-access-to-LightEngine.patch diff --git a/patches/server/0018-Disable-geode-and-monsterspawners-generation.patch b/patches/server/0017-Disable-geode-and-monsterspawners-generation.patch similarity index 100% rename from patches/server/0018-Disable-geode-and-monsterspawners-generation.patch rename to patches/server/0017-Disable-geode-and-monsterspawners-generation.patch diff --git a/patches/server/0019-Set-Mutton-nutrition-equal-to-beef.patch b/patches/server/0018-Set-Mutton-nutrition-equal-to-beef.patch similarity index 100% rename from patches/server/0019-Set-Mutton-nutrition-equal-to-beef.patch rename to patches/server/0018-Set-Mutton-nutrition-equal-to-beef.patch diff --git a/patches/server/0020-PlayerLoadStatsEvent.patch b/patches/server/0019-PlayerLoadStatsEvent.patch similarity index 100% rename from patches/server/0020-PlayerLoadStatsEvent.patch rename to patches/server/0019-PlayerLoadStatsEvent.patch diff --git a/patches/server/0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch b/patches/server/0020-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch similarity index 100% rename from patches/server/0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch rename to patches/server/0020-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch diff --git a/patches/server/0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch b/patches/server/0021-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch similarity index 100% rename from patches/server/0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch rename to patches/server/0021-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch diff --git a/patches/server/0023-noEntityCollisions-for-Entity.patch b/patches/server/0022-noEntityCollisions-for-Entity.patch similarity index 100% rename from patches/server/0023-noEntityCollisions-for-Entity.patch rename to patches/server/0022-noEntityCollisions-for-Entity.patch diff --git a/patches/server/0024-Do-not-freeze-MappedRegistry.patch b/patches/server/0023-Do-not-freeze-MappedRegistry.patch similarity index 100% rename from patches/server/0024-Do-not-freeze-MappedRegistry.patch rename to patches/server/0023-Do-not-freeze-MappedRegistry.patch diff --git a/patches/server/0025-Add-jackson.patch b/patches/server/0024-Add-jackson.patch similarity index 100% rename from patches/server/0025-Add-jackson.patch rename to patches/server/0024-Add-jackson.patch diff --git a/patches/server/0026-Maybe-can-t-tostring.patch b/patches/server/0025-Maybe-can-t-tostring.patch similarity index 100% rename from patches/server/0026-Maybe-can-t-tostring.patch rename to patches/server/0025-Maybe-can-t-tostring.patch diff --git a/patches/server/0027-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0026-Allow-inventory-clicks-in-Spectator.patch similarity index 100% rename from patches/server/0027-Allow-inventory-clicks-in-Spectator.patch rename to patches/server/0026-Allow-inventory-clicks-in-Spectator.patch diff --git a/patches/server/0028-Packet-obfuscation-and-reduction.patch b/patches/server/0027-Packet-obfuscation-and-reduction.patch similarity index 91% rename from patches/server/0028-Packet-obfuscation-and-reduction.patch rename to patches/server/0027-Packet-obfuscation-and-reduction.patch index 8032a5164..21fb3513c 100644 --- a/patches/server/0028-Packet-obfuscation-and-reduction.patch +++ b/patches/server/0027-Packet-obfuscation-and-reduction.patch @@ -156,19 +156,6 @@ index bee42880274cf36c57abc5f633e6f14f41a0ea2b..12fa631aa176e67dcda522dca6376a69 // CraftBukkit end } -diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f1459e5929f178cdab864506d1a485df61fde035..6e7a3acb40ef3ed062c3e6cc2c5bf5cd35f2d2d6 100644 ---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java -+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3167,7 +3167,7 @@ public abstract class LivingEntity extends Entity implements Attackable { - } - - public boolean equipmentHasChanged(ItemStack stack, ItemStack stack2) { -- return !ItemStack.isSame(stack2, stack); -+ return !ItemStack.isSameItem(stack2, stack); - } - - private void handleHandSwap(Map equipmentChanges) { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java index 2a6a85519c63bd3f879a8dbe146a9d05310cee3c..d6cdb7c3314004ee25cbed96eb289d420999c01c 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java diff --git a/patches/server/0029-Long-distance-tracking.patch b/patches/server/0028-Long-distance-tracking.patch similarity index 100% rename from patches/server/0029-Long-distance-tracking.patch rename to patches/server/0028-Long-distance-tracking.patch diff --git a/patches/server/0030-Equipment-Packet-Caching.patch b/patches/server/0029-Equipment-Packet-Caching.patch similarity index 99% rename from patches/server/0030-Equipment-Packet-Caching.patch rename to patches/server/0029-Equipment-Packet-Caching.patch index 48928d957..dc6b122f6 100644 --- a/patches/server/0030-Equipment-Packet-Caching.patch +++ b/patches/server/0029-Equipment-Packet-Caching.patch @@ -59,7 +59,7 @@ index 506e4d80e47723a0764703578370a45ad2f126fd..a1d03e7d4f0a73930e932fffc8707238 if (!this.entity.getPassengers().isEmpty()) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6e7a3acb40ef3ed062c3e6cc2c5bf5cd35f2d2d6..5e5450aeb355ad396ac369816050f297ca0f309f 100644 +index f0d565ac0b3c8d3c3a200348a16e7db21ff3920a..67a83bfd09befa7250f7a02eaf21797cc24e8c71 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -262,6 +262,8 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0031-Add-canDespawn-to-Warden.patch b/patches/server/0030-Add-canDespawn-to-Warden.patch similarity index 100% rename from patches/server/0031-Add-canDespawn-to-Warden.patch rename to patches/server/0030-Add-canDespawn-to-Warden.patch diff --git a/patches/server/0032-Add-reason-to-PlayerConnectionCloseEvent.patch b/patches/server/0031-Add-reason-to-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0032-Add-reason-to-PlayerConnectionCloseEvent.patch rename to patches/server/0031-Add-reason-to-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0033-Disable-feature-generation.patch b/patches/server/0032-Disable-feature-generation.patch similarity index 100% rename from patches/server/0033-Disable-feature-generation.patch rename to patches/server/0032-Disable-feature-generation.patch diff --git a/patches/server/0034-Biome-freeze-override.patch b/patches/server/0033-Biome-freeze-override.patch similarity index 100% rename from patches/server/0034-Biome-freeze-override.patch rename to patches/server/0033-Biome-freeze-override.patch diff --git a/patches/server/0035-Change-KeepAlive-interval.patch b/patches/server/0034-Change-KeepAlive-interval.patch similarity index 100% rename from patches/server/0035-Change-KeepAlive-interval.patch rename to patches/server/0034-Change-KeepAlive-interval.patch diff --git a/patches/server/0036-Non-saveable-entities.patch b/patches/server/0035-Non-saveable-entities.patch similarity index 100% rename from patches/server/0036-Non-saveable-entities.patch rename to patches/server/0035-Non-saveable-entities.patch diff --git a/patches/server/0037-ChunkStatusChangeEvent.patch b/patches/server/0036-ChunkStatusChangeEvent.patch similarity index 100% rename from patches/server/0037-ChunkStatusChangeEvent.patch rename to patches/server/0036-ChunkStatusChangeEvent.patch diff --git a/patches/server/0038-Disable-sending-Entity-Movement-Packets.patch b/patches/server/0037-Disable-sending-Entity-Movement-Packets.patch similarity index 100% rename from patches/server/0038-Disable-sending-Entity-Movement-Packets.patch rename to patches/server/0037-Disable-sending-Entity-Movement-Packets.patch diff --git a/patches/server/0039-Player-spawnsOwnMobs.patch b/patches/server/0038-Player-spawnsOwnMobs.patch similarity index 100% rename from patches/server/0039-Player-spawnsOwnMobs.patch rename to patches/server/0038-Player-spawnsOwnMobs.patch diff --git a/patches/server/0040-Set-location-on-a-Custom-Inventory.patch b/patches/server/0039-Set-location-on-a-Custom-Inventory.patch similarity index 100% rename from patches/server/0040-Set-location-on-a-Custom-Inventory.patch rename to patches/server/0039-Set-location-on-a-Custom-Inventory.patch diff --git a/patches/server/0041-Shared-Data-Storage.patch b/patches/server/0040-Shared-Data-Storage.patch similarity index 100% rename from patches/server/0041-Shared-Data-Storage.patch rename to patches/server/0040-Shared-Data-Storage.patch diff --git a/patches/server/0042-Vanish.patch b/patches/server/0041-Vanish.patch similarity index 100% rename from patches/server/0042-Vanish.patch rename to patches/server/0041-Vanish.patch