From 700708fcda876acef1252e7ecc71ab249ef3c3f4 Mon Sep 17 00:00:00 2001 From: Cryptite Date: Tue, 13 Jun 2023 07:45:08 -0500 Subject: [PATCH] 1.20 patches work --- ...tch => 0023-noEntityCollisions-for-Entity.patch} | 0 ...atch => 0024-Do-not-freeze-MappedRegistry.patch} | 0 ...ctor-to-ClientboundPlayerInfoUpdatePacket.patch} | 0 ...027-Add-jackson.patch => 0026-Add-jackson.patch} | 0 ...string.patch => 0027-Maybe-can-t-tostring.patch} | 0 ... 0028-Allow-inventory-clicks-in-Spectator.patch} | 0 ... => 0029-Packet-obfuscation-and-reduction.patch} | 13 +++++++++++++ ...king.patch => 0030-Long-distance-tracking.patch} | 6 +++--- ...Storage.patch => 0031-Shared-Data-Storage.patch} | 0 ...ng.patch => 0032-Equipment-Packet-Caching.patch} | 2 +- 10 files changed, 17 insertions(+), 4 deletions(-) rename patches/server/{0024-noEntityCollisions-for-Entity.patch => 0023-noEntityCollisions-for-Entity.patch} (100%) rename patches/server/{0025-Do-not-freeze-MappedRegistry.patch => 0024-Do-not-freeze-MappedRegistry.patch} (100%) rename patches/server/{0026-Add-Entry-ctor-to-ClientboundPlayerInfoUpdatePacket.patch => 0025-Add-Entry-ctor-to-ClientboundPlayerInfoUpdatePacket.patch} (100%) rename patches/server/{0027-Add-jackson.patch => 0026-Add-jackson.patch} (100%) rename patches/server/{0028-Maybe-can-t-tostring.patch => 0027-Maybe-can-t-tostring.patch} (100%) rename patches/server/{0029-Allow-inventory-clicks-in-Spectator.patch => 0028-Allow-inventory-clicks-in-Spectator.patch} (100%) rename patches/server/{0030-Packet-obfuscation-and-reduction.patch => 0029-Packet-obfuscation-and-reduction.patch} (91%) rename patches/server/{0031-Long-distance-tracking.patch => 0030-Long-distance-tracking.patch} (94%) rename patches/server/{0032-Shared-Data-Storage.patch => 0031-Shared-Data-Storage.patch} (100%) rename patches/server/{0033-Equipment-Packet-Caching.patch => 0032-Equipment-Packet-Caching.patch} (99%) diff --git a/patches/server/0024-noEntityCollisions-for-Entity.patch b/patches/server/0023-noEntityCollisions-for-Entity.patch similarity index 100% rename from patches/server/0024-noEntityCollisions-for-Entity.patch rename to patches/server/0023-noEntityCollisions-for-Entity.patch diff --git a/patches/server/0025-Do-not-freeze-MappedRegistry.patch b/patches/server/0024-Do-not-freeze-MappedRegistry.patch similarity index 100% rename from patches/server/0025-Do-not-freeze-MappedRegistry.patch rename to patches/server/0024-Do-not-freeze-MappedRegistry.patch diff --git a/patches/server/0026-Add-Entry-ctor-to-ClientboundPlayerInfoUpdatePacket.patch b/patches/server/0025-Add-Entry-ctor-to-ClientboundPlayerInfoUpdatePacket.patch similarity index 100% rename from patches/server/0026-Add-Entry-ctor-to-ClientboundPlayerInfoUpdatePacket.patch rename to patches/server/0025-Add-Entry-ctor-to-ClientboundPlayerInfoUpdatePacket.patch diff --git a/patches/server/0027-Add-jackson.patch b/patches/server/0026-Add-jackson.patch similarity index 100% rename from patches/server/0027-Add-jackson.patch rename to patches/server/0026-Add-jackson.patch diff --git a/patches/server/0028-Maybe-can-t-tostring.patch b/patches/server/0027-Maybe-can-t-tostring.patch similarity index 100% rename from patches/server/0028-Maybe-can-t-tostring.patch rename to patches/server/0027-Maybe-can-t-tostring.patch diff --git a/patches/server/0029-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0028-Allow-inventory-clicks-in-Spectator.patch similarity index 100% rename from patches/server/0029-Allow-inventory-clicks-in-Spectator.patch rename to patches/server/0028-Allow-inventory-clicks-in-Spectator.patch diff --git a/patches/server/0030-Packet-obfuscation-and-reduction.patch b/patches/server/0029-Packet-obfuscation-and-reduction.patch similarity index 91% rename from patches/server/0030-Packet-obfuscation-and-reduction.patch rename to patches/server/0029-Packet-obfuscation-and-reduction.patch index 14aed3430..fa470e25e 100644 --- a/patches/server/0030-Packet-obfuscation-and-reduction.patch +++ b/patches/server/0029-Packet-obfuscation-and-reduction.patch @@ -156,6 +156,19 @@ index e6c16982b50754bae5a31a193c95ef616b735967..aee2375bd72f3ab7f237132a05aada1e // 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 e422d8352f6f7dda8fb7ae8f51ebd5ec2e116115..f731f7131d3270de6bc81962bd713a59968aba34 100644 +--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java ++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +@@ -3134,7 +3134,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 38e110a226aac27d86dfe89bc0e9ecaada6ff268..15515e871c89498ec936ab24871741f883f18a3b 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java diff --git a/patches/server/0031-Long-distance-tracking.patch b/patches/server/0030-Long-distance-tracking.patch similarity index 94% rename from patches/server/0031-Long-distance-tracking.patch rename to patches/server/0030-Long-distance-tracking.patch index c08be8a2e..498303dd4 100644 --- a/patches/server/0031-Long-distance-tracking.patch +++ b/patches/server/0030-Long-distance-tracking.patch @@ -17,7 +17,7 @@ index 4321789e9222350266ea0830473861e2f5fd75ad..6245bbc5745787b835b9b3a89da088ee double d2 = d0 * d0; boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 66bedc539847f3bbe6f735898f53c1ea6f01a263..04b2c211db26ac851d5fdf3fb1277c8e1b4e4216 100644 +index 4aa043cc25d7d770ead47bcc3bf0373336768e5c..20aea9a41bcb21b8063ae3a227d8d385b7fe9665 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -278,6 +278,7 @@ public class ServerPlayer extends Player { @@ -25,10 +25,10 @@ index 66bedc539847f3bbe6f735898f53c1ea6f01a263..04b2c211db26ac851d5fdf3fb1277c8e public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event public boolean smoothWorldTeleport; // Slice + public boolean hasLongDistanceTracking; // Slice - public double targetChunkSendRate = io.papermc.paper.configuration.GlobalConfiguration.get().chunkLoading.targetPlayerChunkSendRate; // Slice private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); -@@ -2651,4 +2652,18 @@ public class ServerPlayer extends Player { + public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; +@@ -2650,4 +2651,18 @@ public class ServerPlayer extends Player { return (CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end diff --git a/patches/server/0032-Shared-Data-Storage.patch b/patches/server/0031-Shared-Data-Storage.patch similarity index 100% rename from patches/server/0032-Shared-Data-Storage.patch rename to patches/server/0031-Shared-Data-Storage.patch diff --git a/patches/server/0033-Equipment-Packet-Caching.patch b/patches/server/0032-Equipment-Packet-Caching.patch similarity index 99% rename from patches/server/0033-Equipment-Packet-Caching.patch rename to patches/server/0032-Equipment-Packet-Caching.patch index e61ad065b..b45c7d0f5 100644 --- a/patches/server/0033-Equipment-Packet-Caching.patch +++ b/patches/server/0032-Equipment-Packet-Caching.patch @@ -59,7 +59,7 @@ index a3cff8bcc0e390865563c97c95f4e28e99a83948..53efe944288b6d58700242eaca97119a // CraftBukkit start - Fix for nonsensical head yaw diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e422d8352f6f7dda8fb7ae8f51ebd5ec2e116115..de88a8ba2e8308103ac0c5facbc428e443314b15 100644 +index f731f7131d3270de6bc81962bd713a59968aba34..09d298f05a6fb3d357cadc0e2d6ee51a24055c66 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -264,6 +264,8 @@ public abstract class LivingEntity extends Entity implements Attackable {