diff --git a/lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch b/lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch index 6c36d8d..1090a0c 100644 --- a/lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch +++ b/lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Correct player respawn place diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 57f93d978fe48fdf6e77b7bfb9f1de060e1a8524..924d5f3236d9ba9836f39fc844392099df9cd25c 100644 +index 57f93d978fe48fdf6e77b7bfb9f1de060e1a8524..c0e4ddbcf2b1f61fd4a5a6f10882fc1fb4176960 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -511,8 +511,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -43,12 +43,3 @@ index 57f93d978fe48fdf6e77b7bfb9f1de060e1a8524..924d5f3236d9ba9836f39fc844392099 if (inChunk == null) { continue; } -@@ -1997,7 +2009,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc - } - - if (newLevel.dimension() == lastDimension) { -- this.connection.internalTeleport(PositionMoveRotation.of(transition), transition.relatives()); // CraftBukkit -+ this.connection.internalTeleport(PositionMoveRotation.of(transition), transition.relatives()); // CraftBukkit // Luminol - Correct player respawn place - this.connection.resetPosition(); - transition.postTeleportTransition().onTransition(this); - return this; diff --git a/lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch b/lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch index 76f5798..213b557 100644 --- a/lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch +++ b/lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not enable any debug subscriptions Really this would really crash the server by accident when the operators used F3 + J or toggled the debug synchronizer diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 924d5f3236d9ba9836f39fc844392099df9cd25c..fe34f2e648df9fd1174522baa5913976104b8d04 100644 +index c0e4ddbcf2b1f61fd4a5a6f10882fc1fb4176960..4e1346777c0664547f73f8672ed02918392b591f 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -3483,7 +3483,8 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch b/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch index 732827e..0ef9f22 100644 --- a/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch +++ b/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix riding statistics desync Referred to: https://github.com/CraftCanvasMC/Canvas/commit/057175b0c10d5a4d1d9059fd9d077750c32633b2 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index fe34f2e648df9fd1174522baa5913976104b8d04..fee4749c7938779f63155297bf9c7aeb0ca21709 100644 +index 4e1346777c0664547f73f8672ed02918392b591f..bc390caff901a3b37a5a4ca3619dd9339fa4cb07 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -2516,7 +2516,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch b/lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch index 5503d82..536f21d 100644 --- a/lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch +++ b/lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix player auto saving ignores interval diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index fee4749c7938779f63155297bf9c7aeb0ca21709..5668906866917f7bb6088ae16146d917d2b840b0 100644 +index bc390caff901a3b37a5a4ca3619dd9339fa4cb07..6e39d752aef322fc1cc12bf221cff057cad18578 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -208,7 +208,7 @@ import org.slf4j.Logger; diff --git a/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch b/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch index 5544513..7111b0a 100644 --- a/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch +++ b/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch @@ -275,7 +275,7 @@ index 534f103234eb92571c664cbcfea4ce4e990d3ea8..c4d9d890db784d376b876d70f0468df6 // CraftBukkit start private final ResourceKey typeKey; diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 5668906866917f7bb6088ae16146d917d2b840b0..4efbd0f840d74a3d96b28d38e48cba72d5c6fb9b 100644 +index 6e39d752aef322fc1cc12bf221cff057cad18578..00dfc496f4e437393f0fc5707f50783418f263f4 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1694,7 +1694,30 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch b/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch index cd50479..e841b36 100644 --- a/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch +++ b/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch @@ -106,7 +106,7 @@ index 0641b98ef3298eb682ceae83f60b730f3bf90103..cea4bc7036dfd8777c151a0dd811fc13 } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 4efbd0f840d74a3d96b28d38e48cba72d5c6fb9b..8e4bbb224d036cf9f33667aec57bbc339c9e8377 100644 +index 00dfc496f4e437393f0fc5707f50783418f263f4..f4fb1f36527e7d29b2b4733bbc7309a162d6949d 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -441,7 +441,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch b/lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch index 3f723da..fb9f5ae 100644 --- a/lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch +++ b/lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add config to enable tick command only freeze/unfreeze/step/query/rate can run when enabled diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java -index ff90abb47203c03636d3175f2b3efcf43517b3b0..a2db29aa47a4b7213d4956f02f6e83122ccfdbd1 100644 +index ff90abb47203c03636d3175f2b3efcf43517b3b0..a96da8ab0d8ca8241df79fbfca33f3e6072db367 100644 --- a/io/papermc/paper/threadedregions/RegionizedServer.java +++ b/io/papermc/paper/threadedregions/RegionizedServer.java @@ -239,6 +239,11 @@ public final class RegionizedServer { @@ -14,7 +14,7 @@ index ff90abb47203c03636d3175f2b3efcf43517b3b0..a2db29aa47a4b7213d4956f02f6e8312 private void globalTick(final long tickCount) { ++this.tickCount; + // Luminol start - Add a config to enable tick command -+ if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) { ++ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect + MinecraftServer.getServer().tickRateManager().tick(); + } + // Luminol end - Add a config to enable tick command @@ -41,12 +41,12 @@ index ff90abb47203c03636d3175f2b3efcf43517b3b0..a2db29aa47a4b7213d4956f02f6e8312 private void tickTime(final ServerLevel world, final long tickCount) { - if (world.tickTime) { -+ if ((!me.earthme.luminol.config.modules.experiment.CommandConfig.tick || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command ++ if ((!fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command // Lophine - redirect world.serverLevelData.setGameTime(world.serverLevelData.getGameTime() + tickCount); } } diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java -index 58e557923dfe6cee39ec45e7f5aa43a5ded9f107..57a35d7a801621fc461e896eb2bba533d9d5bc1b 100644 +index 58e557923dfe6cee39ec45e7f5aa43a5ded9f107..ae424c8931a2f82c6c8d4ddd8422a2c142a77a95 100644 --- a/io/papermc/paper/threadedregions/TickRegionScheduler.java +++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java @@ -40,8 +40,8 @@ public final class TickRegionScheduler { @@ -92,7 +92,7 @@ index 58e557923dfe6cee39ec45e7f5aa43a5ded9f107..57a35d7a801621fc461e896eb2bba533 // next start isn't updated until the end of this tick this.tickRegion(tickCount, tickStart, scheduledEnd); + // Luminol start - Add a config to enable tick command -+ if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) { ++ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect + MinecraftServer.getServer().tickRateManager().endTickWork(); + } + // Luminol end - Add a config to enable tick command @@ -100,7 +100,7 @@ index 58e557923dfe6cee39ec45e7f5aa43a5ded9f107..57a35d7a801621fc461e896eb2bba533 this.scheduler.regionFailed(this, false, thr); // regionFailed will schedule a shutdown, so we should avoid letting this region tick further diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 21f2b9866e1cf36421e10a945fb6fbaa251009ed..aa7931c9b6dc3bba2c8dfecff8df2db302ad905b 100644 +index 21f2b9866e1cf36421e10a945fb6fbaa251009ed..409fcc5e95ca453fee7d3bd0375c910d79b507e6 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -259,7 +259,11 @@ public class Commands { @@ -109,7 +109,7 @@ index 21f2b9866e1cf36421e10a945fb6fbaa251009ed..aa7931c9b6dc3bba2c8dfecff8df2db3 //TestCommand.register(this.dispatcher, context); // Folia - region threading - //TickCommand.register(this.dispatcher); // Folia - region threading - TODO later + // Luminol start - Add a config to enable tick command -+ if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) { ++ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect + TickCommand.register(this.dispatcher); // Folia - region threading - TODO later + } + // Luminol end - Add a config to enable tick command diff --git a/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch b/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch index 3c3a110..43ed14d 100644 --- a/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch +++ b/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing teleportation event APIs for folia diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 8e4bbb224d036cf9f33667aec57bbc339c9e8377..4397f77d0169a3eefd347d3097657de4f6d37ef8 100644 +index f4fb1f36527e7d29b2b4733bbc7309a162d6949d..75a36bbd5671992e78fe36a9b3d946ba465919d5 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1803,6 +1803,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch b/lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch index 9003442..f234c22 100644 --- a/lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch +++ b/lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for waypoint restoration diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index aa7931c9b6dc3bba2c8dfecff8df2db302ad905b..c67ea715f02086e5a39cc5832ccdc0b32199db93 100644 +index 409fcc5e95ca453fee7d3bd0375c910d79b507e6..5a5f7f7fefacaa0d77ec389d6eb332eff519496a 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -267,7 +267,7 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0069-Leaves-Optimized-dragon-respawn.patch b/lophine-server/minecraft-patches/features/0069-Leaves-Optimized-dragon-respawn.patch index 2a27100..0def8c1 100644 --- a/lophine-server/minecraft-patches/features/0069-Leaves-Optimized-dragon-respawn.patch +++ b/lophine-server/minecraft-patches/features/0069-Leaves-Optimized-dragon-respawn.patch @@ -8,7 +8,7 @@ As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/4ade1001e4dd19c47d95 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/level/dimension/end/EnderDragonFight.java b/net/minecraft/world/level/dimension/end/EnderDragonFight.java -index 824ef3f458505569fe5b8efb2055ecea7ba6cc56..3388bf5d2cff00b397af1dd7b9ab93669985b35c 100644 +index 824ef3f458505569fe5b8efb2055ecea7ba6cc56..7c68effb78bcb17ca64e043f87d6449f90b1b0a7 100644 --- a/net/minecraft/world/level/dimension/end/EnderDragonFight.java +++ b/net/minecraft/world/level/dimension/end/EnderDragonFight.java @@ -317,7 +317,67 @@ public class EnderDragonFight extends SavedData { @@ -21,7 +21,7 @@ index 824ef3f458505569fe5b8efb2055ecea7ba6cc56..3388bf5d2cff00b397af1dd7b9ab9366 + private int cachePortalOriginIteratorY = -1; + public BlockPattern.@Nullable BlockPatternMatch findExitPortal() { -+ if (me.earthme.luminol.config.modules.optimizations.OptimizedDragonRespawnConfig.optimizedRespawn) { ++ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.optimizedDragonRespawn) { // Lophine - redirect + int i, j; + for (i = cachePortalChunkIteratorX; i <= 8; ++i) { + for (j = cachePortalChunkIteratorZ; j <= 8; ++j) { diff --git a/lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch b/lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch index add9435..4bfc348 100644 --- a/lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch +++ b/lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch @@ -137,7 +137,7 @@ index 2e71a1cbabf3405e3e4fd5349a1784d895e7e60c..42de919064680b1a464d813976ca5e69 if (!itemStack.isEmpty()) { slots.add(Pair.of(slot, itemStack.copy())); diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 4397f77d0169a3eefd347d3097657de4f6d37ef8..42e09148519596f95fc9c9c63df9c87e6ece3102 100644 +index 75a36bbd5671992e78fe36a9b3d946ba465919d5..e029278822f264bd0c66060cd0031a515d43e98f 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1424,7 +1424,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch b/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch index 53943af..962166e 100644 --- a/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch +++ b/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable cross region damage trace diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 42e09148519596f95fc9c9c63df9c87e6ece3102..444753590d3bc96ce68e25a3834d7abb86e20f94 100644 +index e029278822f264bd0c66060cd0031a515d43e98f..0a6c85ff078df07f80faf7cfb39d301d5788584e 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1448,6 +1448,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch b/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch index bb0b3d6..b4e2f64 100644 --- a/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch +++ b/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable save-all command diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java -index a2db29aa47a4b7213d4956f02f6e83122ccfdbd1..6fb3c88463ff69bddb7d8dcde0e5339567d3e1c6 100644 +index a96da8ab0d8ca8241df79fbfca33f3e6072db367..f881d10d63a665a73aefe03ba1305ca9ae956513 100644 --- a/io/papermc/paper/threadedregions/RegionizedServer.java +++ b/io/papermc/paper/threadedregions/RegionizedServer.java @@ -265,6 +265,8 @@ public final class RegionizedServer { @@ -31,7 +31,7 @@ index 97c514673a454b752ab86b944fd143725ca8090d..ba91d40d6d91588a4b39abfefcb17a36 private final Reference2ReferenceOpenHashMap, Object> regionizedData = new Reference2ReferenceOpenHashMap<>(); diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index c67ea715f02086e5a39cc5832ccdc0b32199db93..946094713bdb294d7d8beb03967b2a2488f5359b 100644 +index 5a5f7f7fefacaa0d77ec389d6eb332eff519496a..f0f6175569100589102d9d76b3ff8f5546030060 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -299,7 +299,11 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch b/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch index b1dcc5c..0741c58 100644 --- a/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch +++ b/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable function command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 946094713bdb294d7d8beb03967b2a2488f5359b..3d9e8c5ba567efd363e0ed54059f67fbfe25e361 100644 +index f0f6175569100589102d9d76b3ff8f5546030060..ddd656e147cdaeb8f91865117e6f9c268b0fd9bc 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -217,7 +217,11 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch b/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch index ebae792..17d1368 100644 --- a/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch +++ b/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable scoreboard command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 3d9e8c5ba567efd363e0ed54059f67fbfe25e361..6642288dde528899d9bce7ccd8d92a199e8975c8 100644 +index ddd656e147cdaeb8f91865117e6f9c268b0fd9bc..5fda3083f73744b0df3aab47b3c378dba41b904c 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -246,7 +246,11 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch b/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch index 6ddf526..8b4c185 100644 --- a/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch +++ b/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable trigger command diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 6642288dde528899d9bce7ccd8d92a199e8975c8..77d7d83cc781baf19593227d20b827bf0be6ed28 100644 +index 5fda3083f73744b0df3aab47b3c378dba41b904c..82af03649c7537274aa54ed942e4aae589b97888 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -274,7 +274,11 @@ public class Commands { diff --git a/lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch index 9b1dd52..933f44d 100644 --- a/lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch +++ b/lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn invulnerable time diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 444753590d3bc96ce68e25a3834d7abb86e20f94..e64db3045ebf08600283a47960005827c1920f94 100644 +index 0a6c85ff078df07f80faf7cfb39d301d5788584e..729fc979fb313ddf2a5c6a04a9a0790440d15830 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -245,6 +245,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch index c9b9b36..1e783da 100644 --- a/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch +++ b/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch @@ -359,7 +359,7 @@ index cb11830c2f399c9706b20f8104686dc0d9b686f9..1c4c67410849f844946e4883585910fc ServerLevel.this.updateSleepingPlayerList(); } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index e64db3045ebf08600283a47960005827c1920f94..a3d3a602ab86e27ae0c6e6207384dc0043279d47 100644 +index 729fc979fb313ddf2a5c6a04a9a0790440d15830..a2e83ca70606a00f36f5b5cbac9f08baf8c5494a 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -232,7 +232,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch b/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch index 5a669d2..5a51f04 100644 --- a/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch +++ b/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch @@ -98,7 +98,7 @@ index ae88e57974f631ff2494c35d6e02049ba5d38014..6b8073023833fc9e99684944802dc594 } } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index a3d3a602ab86e27ae0c6e6207384dc0043279d47..70f7cb6b38a90ca337bd52c18fa7bfd4016b552c 100644 +index a2e83ca70606a00f36f5b5cbac9f08baf8c5494a..2c15275066923cb488be8e1d7777785466768332 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1111,6 +1111,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0126-Carpet-features.patch b/lophine-server/minecraft-patches/features/0126-Carpet-features.patch index 23672dc..249138e 100644 --- a/lophine-server/minecraft-patches/features/0126-Carpet-features.patch +++ b/lophine-server/minecraft-patches/features/0126-Carpet-features.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Carpet features diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java -index 6fb3c88463ff69bddb7d8dcde0e5339567d3e1c6..7ee9eb8439330724c537f9b1451be78dd3a107ad 100644 +index f881d10d63a665a73aefe03ba1305ca9ae956513..7577533f82688304f06c445fd5a1c3fa3c4575fc 100644 --- a/io/papermc/paper/threadedregions/RegionizedServer.java +++ b/io/papermc/paper/threadedregions/RegionizedServer.java @@ -238,6 +238,7 @@ public final class RegionizedServer { @@ -15,7 +15,7 @@ index 6fb3c88463ff69bddb7d8dcde0e5339567d3e1c6..7ee9eb8439330724c537f9b1451be78d + final long tickStartNanos = System.nanoTime(); // Lophine - Carpet features ++this.tickCount; // Luminol start - Add a config to enable tick command - if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) { + if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect @@ -280,6 +281,10 @@ public final class RegionizedServer { } // Lophine end - Add a config to enable tick command @@ -128,7 +128,7 @@ index 8cc4fe9feb57902a4b9a6a26e6175ac00a2cef65..9ab1a812e43145120859734075e2ac99 // Paper start - fix converting txt to json file; moved from constructor } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 70f7cb6b38a90ca337bd52c18fa7bfd4016b552c..9a6f18fd0eb7e2aef174b25d14cfd0f5a3ade6af 100644 +index 2c15275066923cb488be8e1d7777785466768332..9e8157e6a6df32d00fd1f689a6005ce0f7e0dfbd 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -260,6 +260,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0127-Carpet-Features-Compatible.patch b/lophine-server/minecraft-patches/features/0127-Carpet-Features-Compatible.patch deleted file mode 100644 index 29235ad..0000000 --- a/lophine-server/minecraft-patches/features/0127-Carpet-Features-Compatible.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Helvetica Volubi -Date: Wed, 21 Jan 2026 21:28:21 +0800 -Subject: [PATCH] Carpet Features Compatible - - -diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java -index 7ee9eb8439330724c537f9b1451be78dd3a107ad..7577533f82688304f06c445fd5a1c3fa3c4575fc 100644 ---- a/io/papermc/paper/threadedregions/RegionizedServer.java -+++ b/io/papermc/paper/threadedregions/RegionizedServer.java -@@ -241,7 +241,7 @@ public final class RegionizedServer { - final long tickStartNanos = System.nanoTime(); // Lophine - Carpet features - ++this.tickCount; - // Luminol start - Add a config to enable tick command -- if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) { -+ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect - MinecraftServer.getServer().tickRateManager().tick(); - } - // Luminol end - Add a config to enable tick command -@@ -435,7 +435,7 @@ public final class RegionizedServer { - } - - private void tickTime(final ServerLevel world, final long tickCount) { -- if ((!me.earthme.luminol.config.modules.experiment.CommandConfig.tick || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command -+ if ((!fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command // Lophine - redirect - world.serverLevelData.setGameTime(world.serverLevelData.getGameTime() + tickCount); - } - } -diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java -index 57a35d7a801621fc461e896eb2bba533d9d5bc1b..ae424c8931a2f82c6c8d4ddd8422a2c142a77a95 100644 ---- a/io/papermc/paper/threadedregions/TickRegionScheduler.java -+++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java -@@ -576,7 +576,7 @@ public final class TickRegionScheduler { - // next start isn't updated until the end of this tick - this.tickRegion(tickCount, tickStart, scheduledEnd); - // Luminol start - Add a config to enable tick command -- if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) { -+ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect - MinecraftServer.getServer().tickRateManager().endTickWork(); - } - // Luminol end - Add a config to enable tick command -diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 77d7d83cc781baf19593227d20b827bf0be6ed28..82af03649c7537274aa54ed942e4aae589b97888 100644 ---- a/net/minecraft/commands/Commands.java -+++ b/net/minecraft/commands/Commands.java -@@ -268,7 +268,7 @@ public class Commands { - TellRawCommand.register(this.dispatcher, context); - //TestCommand.register(this.dispatcher, context); // Folia - region threading - // Luminol start - Add a config to enable tick command -- if (me.earthme.luminol.config.modules.experiment.CommandConfig.tick) { -+ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.commandTick) { // Lophine - redirect - TickCommand.register(this.dispatcher); // Folia - region threading - TODO later - } - // Luminol end - Add a config to enable tick command -diff --git a/net/minecraft/world/level/dimension/end/EnderDragonFight.java b/net/minecraft/world/level/dimension/end/EnderDragonFight.java -index 3388bf5d2cff00b397af1dd7b9ab93669985b35c..e70a6c295e8c26bdf56528826801f037ad0f93b0 100644 ---- a/net/minecraft/world/level/dimension/end/EnderDragonFight.java -+++ b/net/minecraft/world/level/dimension/end/EnderDragonFight.java -@@ -323,7 +323,7 @@ public class EnderDragonFight extends SavedData { - private int cachePortalOriginIteratorY = -1; - - public BlockPattern.@Nullable BlockPatternMatch findExitPortal() { -- if (me.earthme.luminol.config.modules.optimizations.OptimizedDragonRespawnConfig.optimizedRespawn) { -+ if (fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.optimizedDragonRespawn) { // Lophine - Carpet Features Compatible - int i, j; - for (i = cachePortalChunkIteratorX; i <= 8; ++i) { - for (j = cachePortalChunkIteratorZ; j <= 8; ++j) { diff --git a/lophine-server/minecraft-patches/features/0128-PCA-sync-protocol.patch b/lophine-server/minecraft-patches/features/0127-PCA-sync-protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0128-PCA-sync-protocol.patch rename to lophine-server/minecraft-patches/features/0127-PCA-sync-protocol.patch diff --git a/lophine-server/minecraft-patches/features/0129-Add-Vanilla-like-experience-Config.patch b/lophine-server/minecraft-patches/features/0128-Add-Vanilla-like-experience-Config.patch similarity index 99% rename from lophine-server/minecraft-patches/features/0129-Add-Vanilla-like-experience-Config.patch rename to lophine-server/minecraft-patches/features/0128-Add-Vanilla-like-experience-Config.patch index 9d67fbd..ac3996c 100644 --- a/lophine-server/minecraft-patches/features/0129-Add-Vanilla-like-experience-Config.patch +++ b/lophine-server/minecraft-patches/features/0128-Add-Vanilla-like-experience-Config.patch @@ -21,7 +21,7 @@ index dd17339fe2f9d7660b20eed05b61d6231302aa82..d997e4f7ae6ee4e81f5fffe874f2895d } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 9a6f18fd0eb7e2aef174b25d14cfd0f5a3ade6af..b43bbe461500782a75a49c9238bd4d4d81448d09 100644 +index 9e8157e6a6df32d00fd1f689a6005ce0f7e0dfbd..2da765eb74c4e84254857ad05b7af82eb8500fc3 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -2339,7 +2339,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0130-Restore-vanilla-ender-pearl-loading.patch b/lophine-server/minecraft-patches/features/0129-Restore-vanilla-ender-pearl-loading.patch similarity index 99% rename from lophine-server/minecraft-patches/features/0130-Restore-vanilla-ender-pearl-loading.patch rename to lophine-server/minecraft-patches/features/0129-Restore-vanilla-ender-pearl-loading.patch index 7b55e47..27a7b0f 100644 --- a/lophine-server/minecraft-patches/features/0130-Restore-vanilla-ender-pearl-loading.patch +++ b/lophine-server/minecraft-patches/features/0129-Restore-vanilla-ender-pearl-loading.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Restore vanilla ender pearl loading diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index b43bbe461500782a75a49c9238bd4d4d81448d09..68e36ad03325cd6348dc4bbab37409b70bee6023 100644 +index 2da765eb74c4e84254857ad05b7af82eb8500fc3..d0b9f4140952d0d0416b257077a885d352b40bd1 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -277,7 +277,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0131-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch b/lophine-server/minecraft-patches/features/0130-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0131-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch rename to lophine-server/minecraft-patches/features/0130-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch diff --git a/lophine-server/minecraft-patches/features/0132-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch b/lophine-server/minecraft-patches/features/0131-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0132-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch rename to lophine-server/minecraft-patches/features/0131-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch diff --git a/lophine-server/minecraft-patches/features/0133-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch b/lophine-server/minecraft-patches/features/0132-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0133-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch rename to lophine-server/minecraft-patches/features/0132-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch diff --git a/lophine-server/minecraft-patches/features/0134-Anonymous-Object-Lithium-optimized-collections-for-W.patch b/lophine-server/minecraft-patches/features/0133-Anonymous-Object-Lithium-optimized-collections-for-W.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0134-Anonymous-Object-Lithium-optimized-collections-for-W.patch rename to lophine-server/minecraft-patches/features/0133-Anonymous-Object-Lithium-optimized-collections-for-W.patch diff --git a/lophine-server/minecraft-patches/features/0135-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch b/lophine-server/minecraft-patches/features/0134-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0135-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch rename to lophine-server/minecraft-patches/features/0134-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch diff --git a/lophine-server/minecraft-patches/features/0136-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch b/lophine-server/minecraft-patches/features/0135-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0136-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch rename to lophine-server/minecraft-patches/features/0135-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch diff --git a/lophine-server/minecraft-patches/features/0137-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch b/lophine-server/minecraft-patches/features/0136-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0137-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch rename to lophine-server/minecraft-patches/features/0136-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch diff --git a/lophine-server/minecraft-patches/features/0138-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch b/lophine-server/minecraft-patches/features/0137-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0138-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch rename to lophine-server/minecraft-patches/features/0137-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch