diff --git a/gradle.properties b/gradle.properties index 3d20560..5c0e033 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = me.earthme.luminol version = 1.20.4-R0.1-SNAPSHOT -foliaCommit = 3a91a4a5cfc8ead0fb0014341c6d1d4bc94c85fb +foliaCommit = ef2c6971891b7571261591cd22d27ff555c5d3f2 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0005-Add-config-for-unsafe-teleportation.patch b/patches/server/0005-Add-config-for-unsafe-teleportation.patch index 601cf2e..ae37607 100644 --- a/patches/server/0005-Add-config-for-unsafe-teleportation.patch +++ b/patches/server/0005-Add-config-for-unsafe-teleportation.patch @@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..1b0de6f0ccab72c409a63dc190482900 + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index edb4ffe78e28755e061c46c6834bbc9b7a23ff16..1cf96090a050e7f7b4a2d12ecf41ce3202a3030b 100644 +index 1d77bc6bdb87de1ad6c8740376391dedcaa73089..5e3a5e6b05254481ad413069b249ef554b591f8c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4062,6 +4062,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -4065,6 +4065,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S protected boolean tryEndPortal() { io.papermc.paper.util.TickThread.ensureTickThread(this, "Cannot portal entity async"); diff --git a/patches/server/0007-Add-config-for-vanilla-random.patch b/patches/server/0007-Add-config-for-vanilla-random.patch index 7e914b2..0b052b2 100644 --- a/patches/server/0007-Add-config-for-vanilla-random.patch +++ b/patches/server/0007-Add-config-for-vanilla-random.patch @@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..ee247014c9a2ec1bbb7f25ef41da110a + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1cf96090a050e7f7b4a2d12ecf41ce3202a3030b..1a4fe69f8de997d25c5dd0e8fadd16be81750c59 100644 +index 5e3a5e6b05254481ad413069b249ef554b591f8c..9bbfac91f97331b1b558264c867b7e00185291f2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -564,7 +564,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -567,7 +567,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S this.bb = Entity.INITIAL_AABB; this.stuckSpeedMultiplier = Vec3.ZERO; this.nextStep = 1.0F; diff --git a/patches/server/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch b/patches/server/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch index 532a936..b19a8d7 100644 --- a/patches/server/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch +++ b/patches/server/0017-Teleport-async-if-entity-was-moving-to-another-regio.patch @@ -33,7 +33,7 @@ index 0000000000000000000000000000000000000000..73d99a105a18231901e691922b0c283a + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1a4fe69f8de997d25c5dd0e8fadd16be81750c59..02e0a617739ad165b25addc5f3e32fa9aacf0b3b 100644 +index 9bbfac91f97331b1b558264c867b7e00185291f2..dfb1b8c3af93bfcddb976c003c6ac2d52afc41c6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -7,6 +7,7 @@ import com.google.common.collect.Lists; @@ -53,7 +53,7 @@ index 1a4fe69f8de997d25c5dd0e8fadd16be81750c59..02e0a617739ad165b25addc5f3e32fa9 import net.minecraft.BlockUtil; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -1083,10 +1086,40 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -1086,10 +1089,40 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S } // Paper end - detailed watchdog information diff --git a/patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch index 520e1ef..f2391ae 100644 --- a/patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch +++ b/patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch @@ -72,7 +72,7 @@ index 3b2508dc6cd4f70b09dce3b7e745e6efabaaa74e..b3ff8ed6d0f0414c15b9d2e6a51a0e34 // If the event is cancelled we move the player back to their old location. if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 02e0a617739ad165b25addc5f3e32fa9aacf0b3b..45fd500c1a41ec4568c9e0e579da3d477feb541a 100644 +index dfb1b8c3af93bfcddb976c003c6ac2d52afc41c6..09cdd28dcb2357ba3d7be316b7ca94dc93ac5dd0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -27,6 +27,7 @@ import java.util.stream.Stream; @@ -99,7 +99,7 @@ index 02e0a617739ad165b25addc5f3e32fa9aacf0b3b..45fd500c1a41ec4568c9e0e579da3d47 import org.bukkit.block.BlockFace; import org.bukkit.command.CommandSender; import org.bukkit.craftbukkit.event.CraftPortalEvent; -@@ -3986,6 +3985,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -3989,6 +3988,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S java.util.function.Consumer teleportComplete) { io.papermc.paper.util.TickThread.ensureTickThread(this, "Cannot teleport entity async"); diff --git a/patches/server/0020-Kaiiju-linear-region-format-and-settings.patch b/patches/server/0019-Kaiiju-linear-region-format-and-settings.patch similarity index 100% rename from patches/server/0020-Kaiiju-linear-region-format-and-settings.patch rename to patches/server/0019-Kaiiju-linear-region-format-and-settings.patch diff --git a/patches/server/0019-Piston-fixes-from-molean-server.patch b/patches/server/0019-Piston-fixes-from-molean-server.patch deleted file mode 100644 index 6ba1c9c..0000000 --- a/patches/server/0019-Piston-fixes-from-molean-server.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Wed, 7 Feb 2024 07:18:27 +0000 -Subject: [PATCH] Piston fixes from molean server - - -diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 45fd500c1a41ec4568c9e0e579da3d477feb541a..d8b06e08e6b59f0e6a50f450d1a682ef459d5b57 100644 ---- a/src/main/java/net/minecraft/world/entity/Entity.java -+++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1460,7 +1460,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S - if (movement.lengthSqr() <= 1.0E-7D) { - return movement; - } else { -- long i = this.level().getGameTime(); -+ long i = this.level().getRedstoneGameTime(); //Luminol - Piston fixes from molean server - - if (i != this.pistonDeltasGameTime) { - Arrays.fill(this.pistonDeltas, 0.0D); -diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java -index be74adc86f0ca467f3b59e7b57fd47a8f381d86e..3482ed0449478b258d85751ffc90ce677acbc60f 100644 ---- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java -@@ -152,7 +152,7 @@ public class PistonBaseBlock extends DirectionalBlock { - if (tileentity instanceof PistonMovingBlockEntity) { - PistonMovingBlockEntity tileentitypiston = (PistonMovingBlockEntity) tileentity; - -- if (tileentitypiston.isExtending() && (tileentitypiston.getProgress(0.0F) < 0.5F || world.getGameTime() == tileentitypiston.getLastTicked() || ((ServerLevel) world).isHandlingTick())) { -+ if (tileentitypiston.isExtending() && (tileentitypiston.getProgress(0.0F) < 0.5F || world.getRedstoneGameTime() == tileentitypiston.getLastTicked() || ((ServerLevel) world).isHandlingTick())) { //Luminol - Piston fixes from molean server - b0 = 2; - } - } -diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java -index 1c23597f172f46eec714b510acfedb415bb01bff..3262398db1b053115b83ed6aab15f9fef511d5d3 100644 ---- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java -@@ -277,7 +277,7 @@ public class PistonMovingBlockEntity extends BlockEntity { - } - - public static void tick(Level world, BlockPos pos, BlockState state, PistonMovingBlockEntity blockEntity) { -- blockEntity.lastTicked = world.getGameTime(); -+ blockEntity.lastTicked = world.getRedstoneGameTime(); //Luminol - Piston fixes from molean server - blockEntity.progressO = blockEntity.progress; - if (blockEntity.progressO >= 1.0F) { - if (world.isClientSide && blockEntity.deathTicks < 5) { diff --git a/patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0020-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0021-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0020-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0021-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 91% rename from patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0021-Kaiiju-Vanilla-end-portal-teleportation.patch index 023c41b..3b7d72d 100644 --- a/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch +++ b/patches/server/0021-Kaiiju-Vanilla-end-portal-teleportation.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d8b06e08e6b59f0e6a50f450d1a682ef459d5b57..873139e05446034e131250f7ffa44336a0d7afca 100644 +index 09cdd28dcb2357ba3d7be316b7ca94dc93ac5dd0..d955a555d260d39812b84eb5319db619ec0f8d28 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4192,12 +4192,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -4195,12 +4195,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S targetPos, 16, // load 16 blocks to be safe from block physics ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGH, (chunks) -> { @@ -28,7 +28,7 @@ index d8b06e08e6b59f0e6a50f450d1a682ef459d5b57..873139e05446034e131250f7ffa44336 ); } ); -@@ -4384,6 +4389,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -4387,6 +4392,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S if (!this.canPortalAsync(takePassengers)) { return false; } @@ -39,7 +39,7 @@ index d8b06e08e6b59f0e6a50f450d1a682ef459d5b57..873139e05446034e131250f7ffa44336 Vec3 initialPosition = this.position(); ChunkPos initialPositionChunk = new ChunkPos( -@@ -4442,7 +4451,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -4445,7 +4454,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S // place passengerTree.root.placeInAsync( originWorld, destination, Entity.TELEPORT_FLAG_LOAD_CHUNK | (takePassengers ? Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS : 0L), diff --git a/patches/server/0023-Kaiiju-Async-path-processing.patch b/patches/server/0022-Kaiiju-Async-path-processing.patch similarity index 100% rename from patches/server/0023-Kaiiju-Async-path-processing.patch rename to patches/server/0022-Kaiiju-Async-path-processing.patch diff --git a/patches/server/0024-Petal-Reduce-sensor-work.patch b/patches/server/0023-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0024-Petal-Reduce-sensor-work.patch rename to patches/server/0023-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0025-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0024-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0025-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0024-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 91% rename from patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch index 26fc096..4486618 100644 --- a/patches/server/0026-Pufferfish-Cache-climbing-check-for-activation.patch +++ b/patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish Cache climbing check for activation diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 873139e05446034e131250f7ffa44336a0d7afca..e3935914ebc94f7ee4769c36cea904d8aae9ccca 100644 +index d955a555d260d39812b84eb5319db619ec0f8d28..7834646fd6a894ff85973566d9aeda98e5b0c284 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -311,7 +311,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -18,7 +18,7 @@ index 873139e05446034e131250f7ffa44336a0d7afca..e3935914ebc94f7ee4769c36cea904d8 private Vec3 deltaMovement; private float yRot; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index cced2d25936eed5360716c8c25e4ca87f9150017..3cced696495f4e3ccf05680809809999cb1c98e0 100644 +index fdb5ef574c14fafa1af50f4f656763119695f00e..bbfbeddcba884ae1964f7421fcdf179923bd0d2b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -29,7 +29,7 @@ index cced2d25936eed5360716c8c25e4ca87f9150017..3cced696495f4e3ccf05680809809999 public abstract class LivingEntity extends Entity implements Attackable { -@@ -2035,6 +2034,20 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2043,6 +2042,20 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.lastClimbablePos; } diff --git a/patches/server/0027-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0026-Pufferfish-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0027-Pufferfish-Improve-fluid-direction-caching.patch rename to patches/server/0026-Pufferfish-Improve-fluid-direction-caching.patch diff --git a/patches/server/0028-Pufferfish-Optimize-suffocation.patch b/patches/server/0027-Pufferfish-Optimize-suffocation.patch similarity index 94% rename from patches/server/0028-Pufferfish-Optimize-suffocation.patch rename to patches/server/0027-Pufferfish-Optimize-suffocation.patch index 0217a34..dde12f8 100644 --- a/patches/server/0028-Pufferfish-Optimize-suffocation.patch +++ b/patches/server/0027-Pufferfish-Optimize-suffocation.patch @@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..3e48cd297b4869e5c89b6abc43c726d3 + } +} diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3cced696495f4e3ccf05680809809999cb1c98e0..c807863fa99f4fcbd87dbd083c017db98f921029 100644 +index bbfbeddcba884ae1964f7421fcdf179923bd0d2b..df789b13f57200c66ff4cc59e6b63949a6804e3d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -420,7 +420,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -428,7 +428,7 @@ public abstract class LivingEntity extends Entity implements Attackable { boolean flag = this instanceof net.minecraft.world.entity.player.Player; if (!this.level().isClientSide) { @@ -43,7 +43,7 @@ index 3cced696495f4e3ccf05680809809999cb1c98e0..c807863fa99f4fcbd87dbd083c017db9 this.hurt(this.damageSources().inWall(), 1.0F); } else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) { double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone(); -@@ -1428,6 +1428,19 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1436,6 +1436,19 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.getHealth() <= 0.0F; } diff --git a/patches/server/0029-Pufferfish-Early-return-optimization-for-target-find.patch b/patches/server/0028-Pufferfish-Early-return-optimization-for-target-find.patch similarity index 100% rename from patches/server/0029-Pufferfish-Early-return-optimization-for-target-find.patch rename to patches/server/0028-Pufferfish-Early-return-optimization-for-target-find.patch diff --git a/patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0029-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0029-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0031-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0031-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0030-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0032-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0031-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 96% rename from patches/server/0032-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0031-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch index 8829599..579489c 100644 --- a/patches/server/0032-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch +++ b/patches/server/0031-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Pufferfish Reduce entity fluid lookups if no fluids diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e3935914ebc94f7ee4769c36cea904d8aae9ccca..98b8938640e80919daa4342f16a00fe679ea3817 100644 +index 7834646fd6a894ff85973566d9aeda98e5b0c284..21284dba89c8adbb46086afd9a900fb24ba3e3ea 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -5259,16 +5259,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -5262,16 +5262,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S } public boolean updateFluidHeightAndDoFluidPushing(TagKey tag, double speed) { @@ -34,7 +34,7 @@ index e3935914ebc94f7ee4769c36cea904d8aae9ccca..98b8938640e80919daa4342f16a00fe6 double d1 = 0.0D; boolean flag = this.isPushedByFluid(); boolean flag1 = false; -@@ -5276,14 +5278,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -5279,14 +5281,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S int k1 = 0; BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); @@ -102,7 +102,7 @@ index e3935914ebc94f7ee4769c36cea904d8aae9ccca..98b8938640e80919daa4342f16a00fe6 if (d2 >= axisalignedbb.minY) { flag1 = true; -@@ -5305,9 +5354,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -5308,9 +5357,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S // CraftBukkit end } } diff --git a/patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0032-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0032-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0034-Pufferfish-Entity-TTL.patch b/patches/server/0033-Pufferfish-Entity-TTL.patch similarity index 95% rename from patches/server/0034-Pufferfish-Entity-TTL.patch rename to patches/server/0033-Pufferfish-Entity-TTL.patch index 1d41176..682b8f4 100644 --- a/patches/server/0034-Pufferfish-Entity-TTL.patch +++ b/patches/server/0033-Pufferfish-Entity-TTL.patch @@ -49,10 +49,10 @@ index 0000000000000000000000000000000000000000..15697d69659b6e1e776acf5094684b5f + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 98b8938640e80919daa4342f16a00fe679ea3817..a5c8e5045f2a3db0fb5bf64665f2650f847ab797 100644 +index 21284dba89c8adbb46086afd9a900fb24ba3e3ea..f8a410e9ed04d9a78d1a6a7e63673b1863d715f2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -811,6 +811,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -814,6 +814,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S } public void tick() { diff --git a/patches/server/0035-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0034-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0035-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0034-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0036-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 99% rename from patches/server/0036-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch index 5e6663c..25a2d65 100644 --- a/patches/server/0036-Pufferfish-Dynamic-Activation-of-Brain.patch +++ b/patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch @@ -83,7 +83,7 @@ index da6269249a95d78f91e90416a96bf1b776fd9c97..25a2f23618cd02366f71e704638adfba if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed entity.discard(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a5c8e5045f2a3db0fb5bf64665f2650f847ab797..6815b29adede62deb2724a6843985d067389dc26 100644 +index f8a410e9ed04d9a78d1a6a7e63673b1863d715f2..4b3acc0de20b246e20e2cc91ba0eca493a675729 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -483,6 +483,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0037-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0037-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0038-Pufferfish-Reduce-entity-allocations.patch b/patches/server/0037-Pufferfish-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0038-Pufferfish-Reduce-entity-allocations.patch rename to patches/server/0037-Pufferfish-Reduce-entity-allocations.patch diff --git a/patches/server/0039-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0038-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 97% rename from patches/server/0039-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0038-Pufferfish-Improve-container-checking-with-a-bitset.patch index ffdb6e1..5109ee0 100644 --- a/patches/server/0039-Pufferfish-Improve-container-checking-with-a-bitset.patch +++ b/patches/server/0038-Pufferfish-Improve-container-checking-with-a-bitset.patch @@ -362,7 +362,7 @@ index 9b1243d96e0694c62fc9e82e9be540bce0d2b3ad..3514022d898a24052c917ebf55dcef3e @Override diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 4fe1b822b4c280de9d5b46c1dc965045791c83d0..c099b19020d374ad8cdfbb65049ddfcf2f5a10a7 100644 +index 82e7e76fecceb55522b5828a56f036e42ef55201..882e27de852c89c837d7943c5a9ae6fb3c2e896b 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -48,7 +48,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @@ -374,9 +374,9 @@ index 4fe1b822b4c280de9d5b46c1dc965045791c83d0..c099b19020d374ad8cdfbb65049ddfcf + private gg.airplane.structs.ItemListWithBitset optimizedItems; // Pufferfish + // Pufferfish end public int cooldownTime; - private long tickedGameTime; + private long tickedGameTime = Long.MIN_VALUE; // Folia - region threading -@@ -84,14 +87,37 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -94,14 +97,37 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen public HopperBlockEntity(BlockPos pos, BlockState state) { super(BlockEntityType.HOPPER, pos, state); @@ -416,7 +416,7 @@ index 4fe1b822b4c280de9d5b46c1dc965045791c83d0..c099b19020d374ad8cdfbb65049ddfcf if (!this.tryLoadLootTable(nbt)) { ContainerHelper.loadAllItems(nbt, this.items); } -@@ -494,6 +520,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -504,6 +530,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen } private static boolean isFullContainer(Container inventory, Direction direction) { @@ -424,7 +424,7 @@ index 4fe1b822b4c280de9d5b46c1dc965045791c83d0..c099b19020d374ad8cdfbb65049ddfcf // Paper start - Perf: Optimize Hoppers if (inventory instanceof WorldlyContainer worldlyContainer) { for (final int slot : worldlyContainer.getSlotsForFace(direction)) { -@@ -516,7 +543,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -526,7 +553,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen } private static boolean isEmptyContainer(Container inv, Direction facing) { @@ -437,7 +437,7 @@ index 4fe1b822b4c280de9d5b46c1dc965045791c83d0..c099b19020d374ad8cdfbb65049ddfcf } public static boolean suckInItems(Level world, Hopper hopper) { -@@ -717,7 +748,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -727,7 +758,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) { boolean flag = false; @@ -446,7 +446,7 @@ index 4fe1b822b4c280de9d5b46c1dc965045791c83d0..c099b19020d374ad8cdfbb65049ddfcf if (itemstack1.isEmpty()) { // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem -@@ -912,7 +943,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -922,7 +953,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @Override protected void setItems(NonNullList list) { diff --git a/patches/server/0040-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0039-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0040-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0039-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0041-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0040-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 93% rename from patches/server/0041-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0040-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch index b42639e..edfdf0e 100644 --- a/patches/server/0041-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0040-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..ed62d25d6cd6dfcf8c5db20ced36eb3d + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6815b29adede62deb2724a6843985d067389dc26..437548d56cf0591c7eac7397f0bd42eb2ad440c8 100644 +index 4b3acc0de20b246e20e2cc91ba0eca493a675729..2d78d28120af075bebee4d97428ed48cf27c9d78 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -5457,6 +5457,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -5460,6 +5460,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S return this.feetBlockState; } @@ -52,10 +52,10 @@ index 6815b29adede62deb2724a6843985d067389dc26..437548d56cf0591c7eac7397f0bd42eb return this.chunkPosition; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c807863fa99f4fcbd87dbd083c017db98f921029..56145117fef32385793ed4ff6b096e87af2f12bf 100644 +index df789b13f57200c66ff4cc59e6b63949a6804e3d..c2d155882c94f875c96c13746ff0c5433ab25ed0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2054,19 +2054,43 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2062,19 +2062,43 @@ public abstract class LivingEntity extends Entity implements Attackable { public boolean onClimableCached() { if (!this.blockPosition().equals(this.lastClimbingPosition)) { diff --git a/patches/server/0042-Gale-Optimize-sun-burn-tick.patch b/patches/server/0041-Gale-Optimize-sun-burn-tick.patch similarity index 96% rename from patches/server/0042-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0041-Gale-Optimize-sun-burn-tick.patch index 7cbb255..a455c28 100644 --- a/patches/server/0042-Gale-Optimize-sun-burn-tick.patch +++ b/patches/server/0041-Gale-Optimize-sun-burn-tick.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale Optimize sun burn tick diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 437548d56cf0591c7eac7397f0bd42eb2ad440c8..5a2215f3b3c75457e9b917f388f38a9f49fd1a60 100644 +index 2d78d28120af075bebee4d97428ed48cf27c9d78..a4682b8bd269f52af26a03347e8d3869d2b1ba41 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -310,7 +310,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -17,7 +17,7 @@ index 437548d56cf0591c7eac7397f0bd42eb2ad440c8..5a2215f3b3c75457e9b917f388f38a9f public BlockPos blockPosition; // Pufferfish - private->public private ChunkPos chunkPosition; private Vec3 deltaMovement; -@@ -2065,9 +2065,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -2068,9 +2068,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S /** @deprecated */ @Deprecated public float getLightLevelDependentMagicValue() { diff --git a/patches/server/0043-Gale-Check-frozen-ticks-before-landing-block.patch b/patches/server/0042-Gale-Check-frozen-ticks-before-landing-block.patch similarity index 85% rename from patches/server/0043-Gale-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0042-Gale-Check-frozen-ticks-before-landing-block.patch index 72c2d6e..022a781 100644 --- a/patches/server/0043-Gale-Check-frozen-ticks-before-landing-block.patch +++ b/patches/server/0042-Gale-Check-frozen-ticks-before-landing-block.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Gale Check frozen ticks before landing block diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 56145117fef32385793ed4ff6b096e87af2f12bf..4f029389dac60e2cc74961a67ec4ac7a2de2f404 100644 +index c2d155882c94f875c96c13746ff0c5433ab25ed0..84b47e6cea7ed9730f9c450ba8ba3167d71b2cc9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -589,11 +589,10 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -597,11 +597,10 @@ public abstract class LivingEntity extends Entity implements Attackable { } protected void tryAddFrost() { @@ -21,7 +21,7 @@ index 56145117fef32385793ed4ff6b096e87af2f12bf..4f029389dac60e2cc74961a67ec4ac7a if (attributemodifiable == null) { return; -@@ -603,7 +602,6 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -611,7 +610,6 @@ public abstract class LivingEntity extends Entity implements Attackable { attributemodifiable.addTransientModifier(new AttributeModifier(LivingEntity.SPEED_MODIFIER_POWDER_SNOW_UUID, "Powder snow slow", (double) f, AttributeModifier.Operation.ADDITION)); } diff --git a/patches/server/0044-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch b/patches/server/0043-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch similarity index 100% rename from patches/server/0044-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch rename to patches/server/0043-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch diff --git a/patches/server/0045-Gale-Use-platform-math-functions.patch b/patches/server/0044-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0045-Gale-Use-platform-math-functions.patch rename to patches/server/0044-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0045-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 89% rename from patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0045-Gale-Skip-entity-move-if-movement-is-zero.patch index 7825ccb..ef8e946 100644 --- a/patches/server/0046-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0045-Gale-Skip-entity-move-if-movement-is-zero.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5a2215f3b3c75457e9b917f388f38a9f49fd1a60..b884c39cee98924f867e02da67372aad56c37ffc 100644 +index a4682b8bd269f52af26a03347e8d3869d2b1ba41..d78ad18ac3b69c893a23b6bb9a6837b6a82ebdc2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -319,6 +319,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -16,7 +16,7 @@ index 5a2215f3b3c75457e9b917f388f38a9f49fd1a60..b884c39cee98924f867e02da67372aad public boolean onGround; public boolean horizontalCollision; public boolean verticalCollision; -@@ -1101,6 +1102,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -1104,6 +1105,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S //Luminol end public void move(MoverType movementType, Vec3 movement) { @@ -28,7 +28,7 @@ index 5a2215f3b3c75457e9b917f388f38a9f49fd1a60..b884c39cee98924f867e02da67372aad final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -4954,6 +4960,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -4957,6 +4963,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S } public final void setBoundingBox(AABB boundingBox) { diff --git a/patches/server/0047-Gale-Optimize-world-generation-chunk-and-block-acces.patch b/patches/server/0046-Gale-Optimize-world-generation-chunk-and-block-acces.patch similarity index 100% rename from patches/server/0047-Gale-Optimize-world-generation-chunk-and-block-acces.patch rename to patches/server/0046-Gale-Optimize-world-generation-chunk-and-block-acces.patch diff --git a/patches/server/0048-Gale-Optimize-noise-generation.patch b/patches/server/0047-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0048-Gale-Optimize-noise-generation.patch rename to patches/server/0047-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0049-Gale-Faster-chunk-serialization.patch b/patches/server/0048-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0049-Gale-Faster-chunk-serialization.patch rename to patches/server/0048-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0050-LinearPaper-Remove-all-locks-on-region-files.patch b/patches/server/0049-LinearPaper-Remove-all-locks-on-region-files.patch similarity index 100% rename from patches/server/0050-LinearPaper-Remove-all-locks-on-region-files.patch rename to patches/server/0049-LinearPaper-Remove-all-locks-on-region-files.patch diff --git a/patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0050-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0051-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0050-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0052-Purpur-use-alternative-keep-alive.patch b/patches/server/0051-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0052-Purpur-use-alternative-keep-alive.patch rename to patches/server/0051-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0053-Leaves-Protocol-Core.patch b/patches/server/0052-Leaves-Protocol-Core.patch similarity index 100% rename from patches/server/0053-Leaves-Protocol-Core.patch rename to patches/server/0052-Leaves-Protocol-Core.patch diff --git a/patches/server/0054-Leaves-Bladeren-Protocol.patch b/patches/server/0053-Leaves-Bladeren-Protocol.patch similarity index 100% rename from patches/server/0054-Leaves-Bladeren-Protocol.patch rename to patches/server/0053-Leaves-Bladeren-Protocol.patch diff --git a/patches/server/0055-Leaves-Fix-Bladeren-Protocol.patch b/patches/server/0054-Leaves-Fix-Bladeren-Protocol.patch similarity index 100% rename from patches/server/0055-Leaves-Fix-Bladeren-Protocol.patch rename to patches/server/0054-Leaves-Fix-Bladeren-Protocol.patch diff --git a/patches/server/0056-Leaves-carpet-protocol-support.patch b/patches/server/0055-Leaves-carpet-protocol-support.patch similarity index 100% rename from patches/server/0056-Leaves-carpet-protocol-support.patch rename to patches/server/0055-Leaves-carpet-protocol-support.patch diff --git a/patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0056-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0056-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0058-Leaves-Replay-Mod-API.patch b/patches/server/0057-Leaves-Replay-Mod-API.patch similarity index 100% rename from patches/server/0058-Leaves-Replay-Mod-API.patch rename to patches/server/0057-Leaves-Replay-Mod-API.patch diff --git a/patches/server/0059-Fix-MC-172047.patch b/patches/server/0058-Fix-MC-172047.patch similarity index 100% rename from patches/server/0059-Fix-MC-172047.patch rename to patches/server/0058-Fix-MC-172047.patch diff --git a/patches/server/0060-Fix-MC-2025.patch b/patches/server/0059-Fix-MC-2025.patch similarity index 90% rename from patches/server/0060-Fix-MC-2025.patch rename to patches/server/0059-Fix-MC-2025.patch index e3a7541..f28a484 100644 --- a/patches/server/0060-Fix-MC-2025.patch +++ b/patches/server/0059-Fix-MC-2025.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix-MC-2025 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b884c39cee98924f867e02da67372aad56c37ffc..be31860997fc85103ffb3eb6c441b5503d25bc95 100644 +index d78ad18ac3b69c893a23b6bb9a6837b6a82ebdc2..8f40db062159dea7761a5663edef997a113e828b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2548,6 +2548,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -2551,6 +2551,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S nbttagcompound.putBoolean("Paper.FreezeLock", true); } // Paper end @@ -25,7 +25,7 @@ index b884c39cee98924f867e02da67372aad56c37ffc..be31860997fc85103ffb3eb6c441b550 return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2625,6 +2635,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -2628,6 +2638,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S this.reapplyPosition(); } diff --git a/patches/unapplied/0001-Added-maven-publish.patch b/patches/unapplied/0001-Added-maven-publish.patch deleted file mode 100644 index cdbb7e1..0000000 --- a/patches/unapplied/0001-Added-maven-publish.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: M2ke4U <79621885+MrHua269@users.noreply.github.com> -Date: Sun, 24 Dec 2023 12:11:45 +0800 -Subject: [PATCH] Added maven publish - - -diff --git a/build.gradle.kts b/build.gradle.kts -index 3e3ea0e4e4ceb3283ad2b99957e3795d66a9a716..0f1846c506cbe25cdd37b8f4b7fd9f7aef2bf0b9 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -199,3 +199,23 @@ tasks.check { - dependsOn(scanJarForOldGeneratedCode) - } - // Paper end -+ -+// Luminol start -+publishing { -+ repositories { -+ maven { -+ name = "githubPackage" -+ url = uri("https://maven.pkg.github.com/LuminolMC/Luminol") -+ -+ credentials.username = System.getenv("GITHUB_USERNAME") -+ credentials.password = System.getenv("GITHUB_TOKEN") -+ } -+ -+ publications { -+ register("gpr") { -+ from(components["java"]) -+ } -+ } -+ } -+} -+// Luminol end -\ No newline at end of file