From c8b50d84a997b19df741a53fa991571c2cfa346a Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Sat, 18 Jul 2026 02:00:06 +0800 Subject: [PATCH] 2 patches from EarthMe - Camellia Co-authored-by: MrHua269 --- ...ssing-original-rotation-and-velocity.patch | 47 +++++++++++++++++++ ...mporarily-fix-teleport-yam-and-pitch.patch | 23 --------- ...acket-processing-queue-with-mt-queue.patch | 19 ++++++++ ...rver-I18n.patch => 0084-Server-I18n.patch} | 0 ...-Fix-datapack-command-save-function.patch} | 0 ...rpur-Barrels-and-enderchests-6-rows.patch} | 0 ...to-disable-some-check-for-operators.patch} | 0 ...to-enable-cross-region-damage-trace.patch} | 0 ...d-config-to-enable-save-all-command.patch} | 0 ...d-config-to-enable-function-command.patch} | 0 ...config-to-enable-scoreboard-command.patch} | 0 ...dd-config-to-enable-trigger-command.patch} | 0 ...config-to-enable-raytracing-tracker.patch} | 0 ...patch => 0094-Add-tick-rate-support.patch} | 0 ... 0095-Modify-merge-ItemEntity-logic.patch} | 0 ...ch => 0096-Old-zombie-reinforcement.patch} | 0 ...0097-Old-leader-zombie-health-logic.patch} | 0 ...tch => 0098-Spawn-invulnerable-time.patch} | 0 ... => 0099-Leaves-Item-overstack-util.patch} | 0 ...ch => 0100-Leaves-Old-raid-behavior.patch} | 0 ...-for-Raid-Revert-and-Cross-Region-D.patch} | 0 ...02-Leaves-Leaves-Base-Protocol-Core.patch} | 0 ...-Configurable-trading-with-the-void.patch} | 0 ...atch => 0104-Leaves-Servux-Protocol.patch} | 0 ...avesHooks.patch => 0105-LeavesHooks.patch} | 0 ...ves-Old-Explosion-Damage-Calculator.patch} | 0 ... 0107-Leaves-Redstone-Shears-Wrench.patch} | 0 ... => 0108-Leaves-Syncmatica-Protocol.patch} | 0 ....patch => 0109-Leaves-BBOR-Protocol.patch} | 0 ...h => 0110-Leaves-Xaero-Map-Protocol.patch} | 0 ...=> 0111-Leaves-Support-REI-protocol.patch} | 0 ....patch => 0112-Leaves-Jade-Protocol.patch} | 0 ...lternative-block-placement-Protocol.patch} | 0 ...yer.patch => 0114-Leaves-Fakeplayer.patch} | 0 ...patch => 0115-Leaves-Replay-Mod-API.patch} | 0 ...=> 0116-Leaves-Creative-fly-no-clip.patch} | 0 ... => 0117-Leaves-Wool-Hopper-Counter.patch} | 0 ...tch => 0118-Global-Entities-Counter.patch} | 0 ...aves-Catch-update-suppression-crash.patch} | 2 +- ... 0120-Leaves-CCE-update-suppression.patch} | 0 ...aves-Redstone-ignore-upwards-update.patch} | 0 ...patch => 0122-Instant-Block-Updater.patch} | 0 ...rt-TrapDoorBlock-changes-form-Paper.patch} | 0 ...ss-of-item-drops-due-to-update-supp.patch} | 0 ...et-placed-block-on-exception-Do-not.patch} | 0 ...6-Leaves-Old-Block-remove-behaviour.patch} | 0 ...Tweaks-mob-fire-and-explosion-rules.patch} | 0 ...tures.patch => 0128-Carpet-features.patch} | 0 ... => 0129-Carpet-Features-Compatible.patch} | 0 ...col.patch => 0130-PCA-sync-protocol.patch} | 0 ...-Add-Vanilla-like-experience-Config.patch} | 0 ...Restore-vanilla-ender-pearl-loading.patch} | 2 +- 52 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch delete mode 100644 lophine-server/minecraft-patches/features/0023-Temporarily-fix-teleport-yam-and-pitch.patch create mode 100644 lophine-server/minecraft-patches/features/0083-Replace-packet-processing-queue-with-mt-queue.patch rename lophine-server/minecraft-patches/features/{0083-Server-I18n.patch => 0084-Server-I18n.patch} (100%) rename lophine-server/minecraft-patches/features/{0084-Fix-datapack-command-save-function.patch => 0085-Fix-datapack-command-save-function.patch} (100%) rename lophine-server/minecraft-patches/features/{0085-Purpur-Barrels-and-enderchests-6-rows.patch => 0086-Purpur-Barrels-and-enderchests-6-rows.patch} (100%) rename lophine-server/minecraft-patches/features/{0086-Add-config-to-disable-some-check-for-operators.patch => 0087-Add-config-to-disable-some-check-for-operators.patch} (100%) rename lophine-server/minecraft-patches/features/{0087-Add-config-to-enable-cross-region-damage-trace.patch => 0088-Add-config-to-enable-cross-region-damage-trace.patch} (100%) rename lophine-server/minecraft-patches/features/{0088-Add-config-to-enable-save-all-command.patch => 0089-Add-config-to-enable-save-all-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0089-Add-config-to-enable-function-command.patch => 0090-Add-config-to-enable-function-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0090-Add-config-to-enable-scoreboard-command.patch => 0091-Add-config-to-enable-scoreboard-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0091-Add-config-to-enable-trigger-command.patch => 0092-Add-config-to-enable-trigger-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0092-Add-config-to-enable-raytracing-tracker.patch => 0093-Add-config-to-enable-raytracing-tracker.patch} (100%) rename lophine-server/minecraft-patches/features/{0093-Add-tick-rate-support.patch => 0094-Add-tick-rate-support.patch} (100%) rename lophine-server/minecraft-patches/features/{0094-Modify-merge-ItemEntity-logic.patch => 0095-Modify-merge-ItemEntity-logic.patch} (100%) rename lophine-server/minecraft-patches/features/{0095-Old-zombie-reinforcement.patch => 0096-Old-zombie-reinforcement.patch} (100%) rename lophine-server/minecraft-patches/features/{0096-Old-leader-zombie-health-logic.patch => 0097-Old-leader-zombie-health-logic.patch} (100%) rename lophine-server/minecraft-patches/features/{0097-Spawn-invulnerable-time.patch => 0098-Spawn-invulnerable-time.patch} (100%) rename lophine-server/minecraft-patches/features/{0098-Leaves-Item-overstack-util.patch => 0099-Leaves-Item-overstack-util.patch} (100%) rename lophine-server/minecraft-patches/features/{0099-Leaves-Old-raid-behavior.patch => 0100-Leaves-Old-raid-behavior.patch} (100%) rename lophine-server/minecraft-patches/features/{0100-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch => 0101-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch} (100%) rename lophine-server/minecraft-patches/features/{0101-Leaves-Leaves-Base-Protocol-Core.patch => 0102-Leaves-Leaves-Base-Protocol-Core.patch} (100%) rename lophine-server/minecraft-patches/features/{0102-Leaves-Configurable-trading-with-the-void.patch => 0103-Leaves-Configurable-trading-with-the-void.patch} (100%) rename lophine-server/minecraft-patches/features/{0103-Leaves-Servux-Protocol.patch => 0104-Leaves-Servux-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0104-LeavesHooks.patch => 0105-LeavesHooks.patch} (100%) rename lophine-server/minecraft-patches/features/{0105-Leaves-Old-Explosion-Damage-Calculator.patch => 0106-Leaves-Old-Explosion-Damage-Calculator.patch} (100%) rename lophine-server/minecraft-patches/features/{0106-Leaves-Redstone-Shears-Wrench.patch => 0107-Leaves-Redstone-Shears-Wrench.patch} (100%) rename lophine-server/minecraft-patches/features/{0107-Leaves-Syncmatica-Protocol.patch => 0108-Leaves-Syncmatica-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0108-Leaves-BBOR-Protocol.patch => 0109-Leaves-BBOR-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0109-Leaves-Xaero-Map-Protocol.patch => 0110-Leaves-Xaero-Map-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0110-Leaves-Support-REI-protocol.patch => 0111-Leaves-Support-REI-protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0111-Leaves-Jade-Protocol.patch => 0112-Leaves-Jade-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0112-Leaves-Alternative-block-placement-Protocol.patch => 0113-Leaves-Alternative-block-placement-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0113-Leaves-Fakeplayer.patch => 0114-Leaves-Fakeplayer.patch} (100%) rename lophine-server/minecraft-patches/features/{0114-Leaves-Replay-Mod-API.patch => 0115-Leaves-Replay-Mod-API.patch} (100%) rename lophine-server/minecraft-patches/features/{0115-Leaves-Creative-fly-no-clip.patch => 0116-Leaves-Creative-fly-no-clip.patch} (100%) rename lophine-server/minecraft-patches/features/{0116-Leaves-Wool-Hopper-Counter.patch => 0117-Leaves-Wool-Hopper-Counter.patch} (100%) rename lophine-server/minecraft-patches/features/{0117-Global-Entities-Counter.patch => 0118-Global-Entities-Counter.patch} (100%) rename lophine-server/minecraft-patches/features/{0118-Leaves-Catch-update-suppression-crash.patch => 0119-Leaves-Catch-update-suppression-crash.patch} (99%) rename lophine-server/minecraft-patches/features/{0119-Leaves-CCE-update-suppression.patch => 0120-Leaves-CCE-update-suppression.patch} (100%) rename lophine-server/minecraft-patches/features/{0120-Leaves-Redstone-ignore-upwards-update.patch => 0121-Leaves-Redstone-ignore-upwards-update.patch} (100%) rename lophine-server/minecraft-patches/features/{0121-Instant-Block-Updater.patch => 0122-Instant-Block-Updater.patch} (100%) rename lophine-server/minecraft-patches/features/{0122-Revert-TrapDoorBlock-changes-form-Paper.patch => 0123-Revert-TrapDoorBlock-changes-form-Paper.patch} (100%) rename lophine-server/minecraft-patches/features/{0123-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch => 0124-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch} (100%) rename lophine-server/minecraft-patches/features/{0124-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch => 0125-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch} (100%) rename lophine-server/minecraft-patches/features/{0125-Leaves-Old-Block-remove-behaviour.patch => 0126-Leaves-Old-Block-remove-behaviour.patch} (100%) rename lophine-server/minecraft-patches/features/{0126-MiniTweaks-mob-fire-and-explosion-rules.patch => 0127-MiniTweaks-mob-fire-and-explosion-rules.patch} (100%) rename lophine-server/minecraft-patches/features/{0127-Carpet-features.patch => 0128-Carpet-features.patch} (100%) rename lophine-server/minecraft-patches/features/{0128-Carpet-Features-Compatible.patch => 0129-Carpet-Features-Compatible.patch} (100%) rename lophine-server/minecraft-patches/features/{0129-PCA-sync-protocol.patch => 0130-PCA-sync-protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0130-Add-Vanilla-like-experience-Config.patch => 0131-Add-Vanilla-like-experience-Config.patch} (100%) rename lophine-server/minecraft-patches/features/{0131-Restore-vanilla-ender-pearl-loading.patch => 0132-Restore-vanilla-ender-pearl-loading.patch} (99%) diff --git a/lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch b/lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch new file mode 100644 index 0000000..762bab6 --- /dev/null +++ b/lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch @@ -0,0 +1,47 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Wed, 8 Jul 2026 21:37:19 +0800 +Subject: [PATCH] Fix teleport missing original rotation and velocity + + +diff --git a/io/papermc/paper/threadedregions/TeleportUtils.java b/io/papermc/paper/threadedregions/TeleportUtils.java +index 2a64a5b2cf049661fe3f5a22ddfa39979624f5ec..335e9775e0d9a61f0e9641aba691a3bdf3ac7f2b 100644 +--- a/io/papermc/paper/threadedregions/TeleportUtils.java ++++ b/io/papermc/paper/threadedregions/TeleportUtils.java +@@ -41,7 +41,7 @@ public final class TeleportUtils { + return; + } + (useFromRootVehicle ? realFrom.getRootVehicle() : realFrom).teleportAsync( +- ((CraftWorld)loc.getWorld()).getHandle(), pos, null, null, null, ++ ((CraftWorld)loc.getWorld()).getHandle(), pos, yaw, pitch, null, // Camellia - Fix teleport missing original rotation and velocity + cause, teleportFlags, onComplete + ); + }, +diff --git a/net/minecraft/server/commands/TeleportCommand.java b/net/minecraft/server/commands/TeleportCommand.java +index 13d7965fd4f99f0848b080349df41f8b1c31a19b..5b83f2edd6afe94c28bf491afab737e92fb89dc0 100644 +--- a/net/minecraft/server/commands/TeleportCommand.java ++++ b/net/minecraft/server/commands/TeleportCommand.java +@@ -248,8 +248,8 @@ public class TeleportCommand { + // Folia start - region threading + if (true) { + Vec3 posFinal = new Vec3(x, y, z); +- Float yawFinal = Float.valueOf(newYRot); +- Float pitchFinal = Float.valueOf(newXRot); ++ Float yawFinal = Float.valueOf(newYRot + victim.getYRot()); // Camellia - Fix teleport missing original rotation and velocity ++ Float pitchFinal = Float.valueOf(newXRot + victim.getXRot()); // Camellia - Fix teleport missing original rotation and velocity + victim.getBukkitEntity().taskScheduler.schedule((Entity nmsEntity) -> { + nmsEntity.stopRiding(); + nmsEntity.teleportAsync( +diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java +index ad35eafa457f706879ba8a9c92b3a34e620ee2d6..790c1bcf11150d31bf90c32345e4eb40de9a6a41 100644 +--- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java ++++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java +@@ -99,7 +99,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile { + } + + entity.teleportAsync( +- checkWorld, to, null, null, null, ++ checkWorld, to, null, null, entity.getDeltaMovement(), // Camellia - Fix teleport missing original rotation and velocity + org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.ENDER_PEARL, + // chunk could have been unloaded + Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS | Entity.TELEPORT_FLAG_LOAD_CHUNK, diff --git a/lophine-server/minecraft-patches/features/0023-Temporarily-fix-teleport-yam-and-pitch.patch b/lophine-server/minecraft-patches/features/0023-Temporarily-fix-teleport-yam-and-pitch.patch deleted file mode 100644 index 47af9a0..0000000 --- a/lophine-server/minecraft-patches/features/0023-Temporarily-fix-teleport-yam-and-pitch.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bacteriawa -Date: Tue, 21 Apr 2026 01:28:05 +0800 -Subject: [PATCH] Temporarily fix teleport yam and pitch - - -diff --git a/net/minecraft/server/commands/TeleportCommand.java b/net/minecraft/server/commands/TeleportCommand.java -index 13d7965fd4f99f0848b080349df41f8b1c31a19b..37268fe5d1f21d5b08ed4a1c0e5777bcb062c8e6 100644 ---- a/net/minecraft/server/commands/TeleportCommand.java -+++ b/net/minecraft/server/commands/TeleportCommand.java -@@ -248,8 +248,10 @@ public class TeleportCommand { - // Folia start - region threading - if (true) { - Vec3 posFinal = new Vec3(x, y, z); -- Float yawFinal = Float.valueOf(newYRot); -- Float pitchFinal = Float.valueOf(newXRot); -+ //Float yawFinal = Float.valueOf(newYRot); // Luminol - fix teleport yaw issue -+ //Float pitchFinal = Float.valueOf(newXRot); // Luminol - fix teleport yaw issue -+ Float yawFinal = Float.valueOf(newYRot + victim.getYRot()); // Luminol - fix teleport yaw issue -+ Float pitchFinal = Float.valueOf(newXRot + victim.getXRot()); // Luminol - fix teleport pitch issue - victim.getBukkitEntity().taskScheduler.schedule((Entity nmsEntity) -> { - nmsEntity.stopRiding(); - nmsEntity.teleportAsync( diff --git a/lophine-server/minecraft-patches/features/0083-Replace-packet-processing-queue-with-mt-queue.patch b/lophine-server/minecraft-patches/features/0083-Replace-packet-processing-queue-with-mt-queue.patch new file mode 100644 index 0000000..da24241 --- /dev/null +++ b/lophine-server/minecraft-patches/features/0083-Replace-packet-processing-queue-with-mt-queue.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: NanaChiyo0721 +Date: Mon, 13 Jul 2026 23:10:31 +0800 +Subject: [PATCH] Replace packet processing queue with mt-queue + + +diff --git a/net/minecraft/network/PacketProcessor.java b/net/minecraft/network/PacketProcessor.java +index 10fa576838c726d026df078eef6c693d14c2cbda..20fa23988efbfb50c664fa48cc823adbe8e6ce58 100644 +--- a/net/minecraft/network/PacketProcessor.java ++++ b/net/minecraft/network/PacketProcessor.java +@@ -11,7 +11,7 @@ import org.slf4j.Logger; + + public class PacketProcessor implements AutoCloseable { + private static final Logger LOGGER = LogUtils.getLogger(); +- private final Queue> packetsToBeHandled = Queues.newConcurrentLinkedQueue(); ++ private final Queue> packetsToBeHandled = new ca.spottedleaf.concurrentutil.collection.MultiThreadedQueue<>(); // Camellia - Replace packet processing queue with mt-queue + private final Thread runningThread; + private boolean closed; + diff --git a/lophine-server/minecraft-patches/features/0083-Server-I18n.patch b/lophine-server/minecraft-patches/features/0084-Server-I18n.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0083-Server-I18n.patch rename to lophine-server/minecraft-patches/features/0084-Server-I18n.patch diff --git a/lophine-server/minecraft-patches/features/0084-Fix-datapack-command-save-function.patch b/lophine-server/minecraft-patches/features/0085-Fix-datapack-command-save-function.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0084-Fix-datapack-command-save-function.patch rename to lophine-server/minecraft-patches/features/0085-Fix-datapack-command-save-function.patch diff --git a/lophine-server/minecraft-patches/features/0085-Purpur-Barrels-and-enderchests-6-rows.patch b/lophine-server/minecraft-patches/features/0086-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0085-Purpur-Barrels-and-enderchests-6-rows.patch rename to lophine-server/minecraft-patches/features/0086-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/lophine-server/minecraft-patches/features/0086-Add-config-to-disable-some-check-for-operators.patch b/lophine-server/minecraft-patches/features/0087-Add-config-to-disable-some-check-for-operators.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0086-Add-config-to-disable-some-check-for-operators.patch rename to lophine-server/minecraft-patches/features/0087-Add-config-to-disable-some-check-for-operators.patch diff --git a/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch b/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-cross-region-damage-trace.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch rename to lophine-server/minecraft-patches/features/0088-Add-config-to-enable-cross-region-damage-trace.patch diff --git a/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch b/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-save-all-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch rename to lophine-server/minecraft-patches/features/0089-Add-config-to-enable-save-all-command.patch diff --git a/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch b/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-function-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch rename to lophine-server/minecraft-patches/features/0090-Add-config-to-enable-function-command.patch diff --git a/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch b/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-scoreboard-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch rename to lophine-server/minecraft-patches/features/0091-Add-config-to-enable-scoreboard-command.patch diff --git a/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch b/lophine-server/minecraft-patches/features/0092-Add-config-to-enable-trigger-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch rename to lophine-server/minecraft-patches/features/0092-Add-config-to-enable-trigger-command.patch diff --git a/lophine-server/minecraft-patches/features/0092-Add-config-to-enable-raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0093-Add-config-to-enable-raytracing-tracker.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0092-Add-config-to-enable-raytracing-tracker.patch rename to lophine-server/minecraft-patches/features/0093-Add-config-to-enable-raytracing-tracker.patch diff --git a/lophine-server/minecraft-patches/features/0093-Add-tick-rate-support.patch b/lophine-server/minecraft-patches/features/0094-Add-tick-rate-support.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0093-Add-tick-rate-support.patch rename to lophine-server/minecraft-patches/features/0094-Add-tick-rate-support.patch diff --git a/lophine-server/minecraft-patches/features/0094-Modify-merge-ItemEntity-logic.patch b/lophine-server/minecraft-patches/features/0095-Modify-merge-ItemEntity-logic.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0094-Modify-merge-ItemEntity-logic.patch rename to lophine-server/minecraft-patches/features/0095-Modify-merge-ItemEntity-logic.patch diff --git a/lophine-server/minecraft-patches/features/0095-Old-zombie-reinforcement.patch b/lophine-server/minecraft-patches/features/0096-Old-zombie-reinforcement.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0095-Old-zombie-reinforcement.patch rename to lophine-server/minecraft-patches/features/0096-Old-zombie-reinforcement.patch diff --git a/lophine-server/minecraft-patches/features/0096-Old-leader-zombie-health-logic.patch b/lophine-server/minecraft-patches/features/0097-Old-leader-zombie-health-logic.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0096-Old-leader-zombie-health-logic.patch rename to lophine-server/minecraft-patches/features/0097-Old-leader-zombie-health-logic.patch diff --git a/lophine-server/minecraft-patches/features/0097-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0098-Spawn-invulnerable-time.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0097-Spawn-invulnerable-time.patch rename to lophine-server/minecraft-patches/features/0098-Spawn-invulnerable-time.patch diff --git a/lophine-server/minecraft-patches/features/0098-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0099-Leaves-Item-overstack-util.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0098-Leaves-Item-overstack-util.patch rename to lophine-server/minecraft-patches/features/0099-Leaves-Item-overstack-util.patch diff --git a/lophine-server/minecraft-patches/features/0099-Leaves-Old-raid-behavior.patch b/lophine-server/minecraft-patches/features/0100-Leaves-Old-raid-behavior.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0099-Leaves-Old-raid-behavior.patch rename to lophine-server/minecraft-patches/features/0100-Leaves-Old-raid-behavior.patch diff --git a/lophine-server/minecraft-patches/features/0100-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch b/lophine-server/minecraft-patches/features/0101-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0100-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch rename to lophine-server/minecraft-patches/features/0101-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch diff --git a/lophine-server/minecraft-patches/features/0101-Leaves-Leaves-Base-Protocol-Core.patch b/lophine-server/minecraft-patches/features/0102-Leaves-Leaves-Base-Protocol-Core.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0101-Leaves-Leaves-Base-Protocol-Core.patch rename to lophine-server/minecraft-patches/features/0102-Leaves-Leaves-Base-Protocol-Core.patch diff --git a/lophine-server/minecraft-patches/features/0102-Leaves-Configurable-trading-with-the-void.patch b/lophine-server/minecraft-patches/features/0103-Leaves-Configurable-trading-with-the-void.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0102-Leaves-Configurable-trading-with-the-void.patch rename to lophine-server/minecraft-patches/features/0103-Leaves-Configurable-trading-with-the-void.patch diff --git a/lophine-server/minecraft-patches/features/0103-Leaves-Servux-Protocol.patch b/lophine-server/minecraft-patches/features/0104-Leaves-Servux-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0103-Leaves-Servux-Protocol.patch rename to lophine-server/minecraft-patches/features/0104-Leaves-Servux-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0104-LeavesHooks.patch b/lophine-server/minecraft-patches/features/0105-LeavesHooks.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0104-LeavesHooks.patch rename to lophine-server/minecraft-patches/features/0105-LeavesHooks.patch diff --git a/lophine-server/minecraft-patches/features/0105-Leaves-Old-Explosion-Damage-Calculator.patch b/lophine-server/minecraft-patches/features/0106-Leaves-Old-Explosion-Damage-Calculator.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0105-Leaves-Old-Explosion-Damage-Calculator.patch rename to lophine-server/minecraft-patches/features/0106-Leaves-Old-Explosion-Damage-Calculator.patch diff --git a/lophine-server/minecraft-patches/features/0106-Leaves-Redstone-Shears-Wrench.patch b/lophine-server/minecraft-patches/features/0107-Leaves-Redstone-Shears-Wrench.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0106-Leaves-Redstone-Shears-Wrench.patch rename to lophine-server/minecraft-patches/features/0107-Leaves-Redstone-Shears-Wrench.patch diff --git a/lophine-server/minecraft-patches/features/0107-Leaves-Syncmatica-Protocol.patch b/lophine-server/minecraft-patches/features/0108-Leaves-Syncmatica-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0107-Leaves-Syncmatica-Protocol.patch rename to lophine-server/minecraft-patches/features/0108-Leaves-Syncmatica-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0108-Leaves-BBOR-Protocol.patch b/lophine-server/minecraft-patches/features/0109-Leaves-BBOR-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0108-Leaves-BBOR-Protocol.patch rename to lophine-server/minecraft-patches/features/0109-Leaves-BBOR-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0109-Leaves-Xaero-Map-Protocol.patch b/lophine-server/minecraft-patches/features/0110-Leaves-Xaero-Map-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0109-Leaves-Xaero-Map-Protocol.patch rename to lophine-server/minecraft-patches/features/0110-Leaves-Xaero-Map-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0110-Leaves-Support-REI-protocol.patch b/lophine-server/minecraft-patches/features/0111-Leaves-Support-REI-protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0110-Leaves-Support-REI-protocol.patch rename to lophine-server/minecraft-patches/features/0111-Leaves-Support-REI-protocol.patch diff --git a/lophine-server/minecraft-patches/features/0111-Leaves-Jade-Protocol.patch b/lophine-server/minecraft-patches/features/0112-Leaves-Jade-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0111-Leaves-Jade-Protocol.patch rename to lophine-server/minecraft-patches/features/0112-Leaves-Jade-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0112-Leaves-Alternative-block-placement-Protocol.patch b/lophine-server/minecraft-patches/features/0113-Leaves-Alternative-block-placement-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0112-Leaves-Alternative-block-placement-Protocol.patch rename to lophine-server/minecraft-patches/features/0113-Leaves-Alternative-block-placement-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0113-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0114-Leaves-Fakeplayer.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0113-Leaves-Fakeplayer.patch rename to lophine-server/minecraft-patches/features/0114-Leaves-Fakeplayer.patch diff --git a/lophine-server/minecraft-patches/features/0114-Leaves-Replay-Mod-API.patch b/lophine-server/minecraft-patches/features/0115-Leaves-Replay-Mod-API.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0114-Leaves-Replay-Mod-API.patch rename to lophine-server/minecraft-patches/features/0115-Leaves-Replay-Mod-API.patch diff --git a/lophine-server/minecraft-patches/features/0115-Leaves-Creative-fly-no-clip.patch b/lophine-server/minecraft-patches/features/0116-Leaves-Creative-fly-no-clip.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0115-Leaves-Creative-fly-no-clip.patch rename to lophine-server/minecraft-patches/features/0116-Leaves-Creative-fly-no-clip.patch diff --git a/lophine-server/minecraft-patches/features/0116-Leaves-Wool-Hopper-Counter.patch b/lophine-server/minecraft-patches/features/0117-Leaves-Wool-Hopper-Counter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0116-Leaves-Wool-Hopper-Counter.patch rename to lophine-server/minecraft-patches/features/0117-Leaves-Wool-Hopper-Counter.patch diff --git a/lophine-server/minecraft-patches/features/0117-Global-Entities-Counter.patch b/lophine-server/minecraft-patches/features/0118-Global-Entities-Counter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0117-Global-Entities-Counter.patch rename to lophine-server/minecraft-patches/features/0118-Global-Entities-Counter.patch diff --git a/lophine-server/minecraft-patches/features/0118-Leaves-Catch-update-suppression-crash.patch b/lophine-server/minecraft-patches/features/0119-Leaves-Catch-update-suppression-crash.patch similarity index 99% rename from lophine-server/minecraft-patches/features/0118-Leaves-Catch-update-suppression-crash.patch rename to lophine-server/minecraft-patches/features/0119-Leaves-Catch-update-suppression-crash.patch index 388cfa8..e0786b4 100644 --- a/lophine-server/minecraft-patches/features/0118-Leaves-Catch-update-suppression-crash.patch +++ b/lophine-server/minecraft-patches/features/0119-Leaves-Catch-update-suppression-crash.patch @@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/network/PacketProcessor.java b/net/minecraft/network/PacketProcessor.java -index 10fa576838c726d026df078eef6c693d14c2cbda..03c4fab3f9be4f69d8c418e6fdd88211cb1b6ff7 100644 +index 20fa23988efbfb50c664fa48cc823adbe8e6ce58..1a95ccd745f4789225d711ab6fe497c677c203d6 100644 --- a/net/minecraft/network/PacketProcessor.java +++ b/net/minecraft/network/PacketProcessor.java @@ -105,7 +105,23 @@ public class PacketProcessor implements AutoCloseable { diff --git a/lophine-server/minecraft-patches/features/0119-Leaves-CCE-update-suppression.patch b/lophine-server/minecraft-patches/features/0120-Leaves-CCE-update-suppression.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0119-Leaves-CCE-update-suppression.patch rename to lophine-server/minecraft-patches/features/0120-Leaves-CCE-update-suppression.patch diff --git a/lophine-server/minecraft-patches/features/0120-Leaves-Redstone-ignore-upwards-update.patch b/lophine-server/minecraft-patches/features/0121-Leaves-Redstone-ignore-upwards-update.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0120-Leaves-Redstone-ignore-upwards-update.patch rename to lophine-server/minecraft-patches/features/0121-Leaves-Redstone-ignore-upwards-update.patch diff --git a/lophine-server/minecraft-patches/features/0121-Instant-Block-Updater.patch b/lophine-server/minecraft-patches/features/0122-Instant-Block-Updater.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0121-Instant-Block-Updater.patch rename to lophine-server/minecraft-patches/features/0122-Instant-Block-Updater.patch diff --git a/lophine-server/minecraft-patches/features/0122-Revert-TrapDoorBlock-changes-form-Paper.patch b/lophine-server/minecraft-patches/features/0123-Revert-TrapDoorBlock-changes-form-Paper.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0122-Revert-TrapDoorBlock-changes-form-Paper.patch rename to lophine-server/minecraft-patches/features/0123-Revert-TrapDoorBlock-changes-form-Paper.patch diff --git a/lophine-server/minecraft-patches/features/0123-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch b/lophine-server/minecraft-patches/features/0124-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0123-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch rename to lophine-server/minecraft-patches/features/0124-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch diff --git a/lophine-server/minecraft-patches/features/0124-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch b/lophine-server/minecraft-patches/features/0125-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0124-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch rename to lophine-server/minecraft-patches/features/0125-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch diff --git a/lophine-server/minecraft-patches/features/0125-Leaves-Old-Block-remove-behaviour.patch b/lophine-server/minecraft-patches/features/0126-Leaves-Old-Block-remove-behaviour.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0125-Leaves-Old-Block-remove-behaviour.patch rename to lophine-server/minecraft-patches/features/0126-Leaves-Old-Block-remove-behaviour.patch diff --git a/lophine-server/minecraft-patches/features/0126-MiniTweaks-mob-fire-and-explosion-rules.patch b/lophine-server/minecraft-patches/features/0127-MiniTweaks-mob-fire-and-explosion-rules.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0126-MiniTweaks-mob-fire-and-explosion-rules.patch rename to lophine-server/minecraft-patches/features/0127-MiniTweaks-mob-fire-and-explosion-rules.patch diff --git a/lophine-server/minecraft-patches/features/0127-Carpet-features.patch b/lophine-server/minecraft-patches/features/0128-Carpet-features.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0127-Carpet-features.patch rename to lophine-server/minecraft-patches/features/0128-Carpet-features.patch diff --git a/lophine-server/minecraft-patches/features/0128-Carpet-Features-Compatible.patch b/lophine-server/minecraft-patches/features/0129-Carpet-Features-Compatible.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0128-Carpet-Features-Compatible.patch rename to lophine-server/minecraft-patches/features/0129-Carpet-Features-Compatible.patch diff --git a/lophine-server/minecraft-patches/features/0129-PCA-sync-protocol.patch b/lophine-server/minecraft-patches/features/0130-PCA-sync-protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0129-PCA-sync-protocol.patch rename to lophine-server/minecraft-patches/features/0130-PCA-sync-protocol.patch diff --git a/lophine-server/minecraft-patches/features/0130-Add-Vanilla-like-experience-Config.patch b/lophine-server/minecraft-patches/features/0131-Add-Vanilla-like-experience-Config.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0130-Add-Vanilla-like-experience-Config.patch rename to lophine-server/minecraft-patches/features/0131-Add-Vanilla-like-experience-Config.patch diff --git a/lophine-server/minecraft-patches/features/0131-Restore-vanilla-ender-pearl-loading.patch b/lophine-server/minecraft-patches/features/0132-Restore-vanilla-ender-pearl-loading.patch similarity index 99% rename from lophine-server/minecraft-patches/features/0131-Restore-vanilla-ender-pearl-loading.patch rename to lophine-server/minecraft-patches/features/0132-Restore-vanilla-ender-pearl-loading.patch index 9ce9665..cb07a1e 100644 --- a/lophine-server/minecraft-patches/features/0131-Restore-vanilla-ender-pearl-loading.patch +++ b/lophine-server/minecraft-patches/features/0132-Restore-vanilla-ender-pearl-loading.patch @@ -89,7 +89,7 @@ index 432a6dfff8e45eccea653b0d4cf04956edec6d98..835c13ff69592951261f917ad999d9a7 level.removePlayerImmediately(player, Entity.RemovalReason.UNLOADED_WITH_PLAYER); diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java -index ad35eafa457f706879ba8a9c92b3a34e620ee2d6..7b607a9fb9955f0a1b843ed59d6b15e97fd37325 100644 +index 790c1bcf11150d31bf90c32345e4eb40de9a6a41..7409b452567608dbdb36ac686791e604a267fb6a 100644 --- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java +++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java @@ -31,7 +31,11 @@ import net.minecraft.world.phys.Vec3;