From 0f7ca21adde4ef35bb9d34a89bdbe11781f4cfd5 Mon Sep 17 00:00:00 2001 From: Jake Date: Wed, 24 Nov 2021 09:22:48 -0800 Subject: [PATCH] several more patches updated --- .../0241-Player-Chunk-Load-Unload-Events.patch} | 0 ...242-Expose-LivingEntity-hurt-direction.patch} | 0 ...dd-OBSTRUCTED-reason-to-BedEnterResult.patch} | 0 .../0539-MC-4-Fix-item-position-desync.patch} | 16 +++++++++------- .../0540-Player-Chunk-Load-Unload-Events.patch} | 8 ++++---- ...0541-Optimize-Dynamic-get-Missing-Keys.patch} | 0 ...542-Expose-LivingEntity-hurt-direction.patch} | 2 +- ...dd-OBSTRUCTED-reason-to-BedEnterResult.patch} | 2 +- ...rom-invalid-ingredient-lists-in-Villag.patch} | 4 ++-- 9 files changed, 17 insertions(+), 15 deletions(-) rename patches/{unapplied/api/0243-Player-Chunk-Load-Unload-Events.patch => api/0241-Player-Chunk-Load-Unload-Events.patch} (100%) rename patches/{unapplied/api/0244-Expose-LivingEntity-hurt-direction.patch => api/0242-Expose-LivingEntity-hurt-direction.patch} (100%) rename patches/{unapplied/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => api/0243-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%) rename patches/{unapplied/server/0567-MC-4-Fix-item-position-desync.patch => server/0539-MC-4-Fix-item-position-desync.patch} (84%) rename patches/{unapplied/server/0568-Player-Chunk-Load-Unload-Events.patch => server/0540-Player-Chunk-Load-Unload-Events.patch} (85%) rename patches/{unapplied/server/0569-Optimize-Dynamic-get-Missing-Keys.patch => server/0541-Optimize-Dynamic-get-Missing-Keys.patch} (100%) rename patches/{unapplied/server/0570-Expose-LivingEntity-hurt-direction.patch => server/0542-Expose-LivingEntity-hurt-direction.patch} (91%) rename patches/{unapplied/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => server/0543-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (91%) rename patches/{unapplied/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => server/0544-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (88%) diff --git a/patches/unapplied/api/0243-Player-Chunk-Load-Unload-Events.patch b/patches/api/0241-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/unapplied/api/0243-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0241-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/unapplied/api/0244-Expose-LivingEntity-hurt-direction.patch b/patches/api/0242-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/unapplied/api/0244-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0242-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/unapplied/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0243-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/unapplied/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0243-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/unapplied/server/0567-MC-4-Fix-item-position-desync.patch b/patches/server/0539-MC-4-Fix-item-position-desync.patch similarity index 84% rename from patches/unapplied/server/0567-MC-4-Fix-item-position-desync.patch rename to patches/server/0539-MC-4-Fix-item-position-desync.patch index e5b59a19fe..14c203a60a 100644 --- a/patches/unapplied/server/0567-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0539-MC-4-Fix-item-position-desync.patch @@ -9,19 +9,21 @@ loss, which forces the server to lose the same precision as the client keeping them in sync. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 288310df8ca9eff6901d906b48ba7cd1b6bc8ae3..3a39180042a7753feba2262ad1a8fd6b92132846 100644 +index 1de3d8848419fce792e28c8100eca1b2488ac968..408e359e6f1a07c5616822e2ecf7549bf481c77d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -498,4 +498,9 @@ public class PaperConfig { - private static void trackPluginScoreboards() { +@@ -101,6 +101,11 @@ public class PaperConfig { trackPluginScoreboards = getBoolean("settings.track-plugin-scoreboards", false); } -+ + + public static boolean fixEntityPositionDesync = true; + private static void fixEntityPositionDesync() { + fixEntityPositionDesync = getBoolean("settings.fix-entity-position-desync", fixEntityPositionDesync); + } - } ++ + public static void registerCommands() { + for (Map.Entry entry : commands.entrySet()) { + MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue()); diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f900d72dab 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java @@ -41,10 +43,10 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9 public Vec3 updateEntityPosition(Vec3 orig) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 34b3e3a522dd8fd226cb32d1218f75092065c431..7b8e747a44d9a60f345154a9aee817b8d923b424 100644 +index 11cb360e71b3f2e3d6821162af91d6752e8d17c0..a6ef4b05daaa93ef333647cc00f8a708d466aaba 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3785,6 +3785,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -3789,6 +3789,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i } public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) { // Paper end diff --git a/patches/unapplied/server/0568-Player-Chunk-Load-Unload-Events.patch b/patches/server/0540-Player-Chunk-Load-Unload-Events.patch similarity index 85% rename from patches/unapplied/server/0568-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0540-Player-Chunk-Load-Unload-Events.patch index ca82401340..6def485799 100644 --- a/patches/unapplied/server/0568-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0540-Player-Chunk-Load-Unload-Events.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4f1291a1f840000aac782389e4c93b317cbf90d1..8608464c1d229625a10fd459427d8cc5e217789a 100644 +index 207c566603671685f7d0abbb11274d2027568a05..6166d1ce68742fbcb365c59cd44a611addbe2f8c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2094,11 +2094,21 @@ public class ServerPlayer extends Player { - public void trackChunk(ChunkPos chunkPos, Packet chunkDataPacket, Packet lightUpdatePacket) { - this.connection.send(lightUpdatePacket); +@@ -2091,11 +2091,21 @@ public class ServerPlayer extends Player { + + public void trackChunk(ChunkPos chunkPos, Packet chunkDataPacket) { this.connection.send(chunkDataPacket); + // Paper start + if(io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0){ diff --git a/patches/unapplied/server/0569-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0541-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/unapplied/server/0569-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0541-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/unapplied/server/0570-Expose-LivingEntity-hurt-direction.patch b/patches/server/0542-Expose-LivingEntity-hurt-direction.patch similarity index 91% rename from patches/unapplied/server/0570-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0542-Expose-LivingEntity-hurt-direction.patch index 42601ba828..2f461711f6 100644 --- a/patches/unapplied/server/0570-Expose-LivingEntity-hurt-direction.patch +++ b/patches/server/0542-Expose-LivingEntity-hurt-direction.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 37d8519c9c653be0eb60563dc5811a1202a662dd..154886c81830ef2133ea44a93df807375021e51a 100644 +index 24ffc967391c9ba175f41396a90007ecdc32f55c..0293d6fd1bb29f75fa1fa1cdfa36b3f679c1bc45 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -850,5 +850,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/unapplied/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0543-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 91% rename from patches/unapplied/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0543-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index ab7f8e1268..5bd4c80e2e 100644 --- a/patches/unapplied/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0543-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 869990c181403a025d219dbd0e1201005973ffe9..aaefea1af4086e74f356bbb09b130a9845fa82f1 100644 +index 1c0bf20f19a697e588a1d0210c181d29edbcaba7..37d99e3a1771feee9edb94f17a649ebb3511a459 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -262,6 +262,10 @@ public class CraftEventFactory { diff --git a/patches/unapplied/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0544-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 88% rename from patches/unapplied/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0544-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch index f8e8f443d3..e870bb8917 100644 --- a/patches/unapplied/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch +++ b/patches/server/0544-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Do not crash from invalid ingredient lists in diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java -index 2610d9cd849aa38cc7a67aef21223707e85682ec..4a7b657265cbbc91ae85409abb3db29cfc555a2c 100644 +index 68bd3bb6fde77a65b5271631f6ef726dc613019b..742ffe531bb8f3a9ca34dea99b044123d90cfff9 100644 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java -@@ -279,7 +279,11 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa +@@ -275,7 +275,11 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa Bukkit.getPluginManager().callEvent(event); } if (!event.isCancelled()) {