diff --git a/patches/server/0005-Add-config-for-unsafe-teleportation.patch b/patches/server/0005-Add-config-for-unsafe-teleportation.patch index e472f28..d6c7f41 100644 --- a/patches/server/0005-Add-config-for-unsafe-teleportation.patch +++ b/patches/server/0005-Add-config-for-unsafe-teleportation.patch @@ -30,18 +30,6 @@ index 0000000000000000000000000000000000000000..ea374875f529b30db17e8b8cb07b99a6 + return "allow_unsafe_teleportation"; + } +} -diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7a102b4e90fbc09b8653e5b566299efe24a04cf6..2a5db8f4ad54b772a0a8bce429fff8b539db81ed 100644 ---- a/src/main/java/net/minecraft/world/entity/Entity.java -+++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4142,6 +4142,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess - - public boolean endPortalLogicAsync(BlockPos portalPos) { - ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async"); -+ if (me.earthme.luminol.config.modules.fixes.UnsafeTeleportationConfig.enabled && !(this instanceof Player)) return false; // Luminol - Unsafe teleportation - - ServerLevel destination = this.getServer().getLevel(this.level().getTypeKey() == net.minecraft.world.level.dimension.LevelStem.END ? Level.OVERWORLD : Level.END); - if (destination == null) { diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java index 5d6b1a63a2a213f8a4e81c5e574847007a82007b..77ff2a526a1d2b9307dfc696f9862bfda7407475 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java diff --git a/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch index c02a111..42b5865 100644 --- a/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch +++ b/patches/server/0022-Kaiiju-Vanilla-end-portal-teleportation.patch @@ -5,7 +5,7 @@ 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 39e96b21e77607782da13b4c74c65d8a68af2433..3958bc6d5172698af88555352a5321083c2367d3 100644 +index a90820a672379639e89c5bb71abcd9aa69227473..794f08a815672b18d22416fc5787f886f895f7be 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -109,6 +109,7 @@ import net.minecraft.world.level.block.Rotation; @@ -16,7 +16,7 @@ index 39e96b21e77607782da13b4c74c65d8a68af2433..3958bc6d5172698af88555352a532108 import net.minecraft.world.level.entity.EntityAccess; import net.minecraft.world.level.entity.EntityInLevelCallback; import net.minecraft.world.level.gameevent.DynamicGameEventListener; -@@ -4229,13 +4230,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4228,13 +4229,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess targetPos, 16, // load 16 blocks to be safe from block physics ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGH, (chunks) -> { @@ -37,7 +37,7 @@ index 39e96b21e77607782da13b4c74c65d8a68af2433..3958bc6d5172698af88555352a532108 DimensionTransition.PLAY_PORTAL_SOUND.then(DimensionTransition.PLACE_PORTAL_TICKET), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL ) -@@ -4432,6 +4438,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4431,6 +4437,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess if (!this.canPortalAsync(destination, takePassengers)) { return false; } @@ -48,7 +48,7 @@ index 39e96b21e77607782da13b4c74c65d8a68af2433..3958bc6d5172698af88555352a532108 Vec3 initialPosition = this.position(); ChunkPos initialPositionChunk = new ChunkPos( -@@ -4496,9 +4506,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4495,9 +4505,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess info.postDimensionTransition().onTransition(teleported); } diff --git a/patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0032-Pufferfish-Entity-TTL.patch b/patches/server/0031-Pufferfish-Entity-TTL.patch similarity index 97% rename from patches/server/0032-Pufferfish-Entity-TTL.patch rename to patches/server/0031-Pufferfish-Entity-TTL.patch index 562f4bc..9b4b496 100644 --- a/patches/server/0032-Pufferfish-Entity-TTL.patch +++ b/patches/server/0031-Pufferfish-Entity-TTL.patch @@ -49,7 +49,7 @@ 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 44a08cc2e94d52747ba6a66e4b57543dfa5f66c2..d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b 100644 +index 794f08a815672b18d22416fc5787f886f895f7be..8a8ad0952ac5f128aeabc0856426227bfb7b9893 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -858,6 +858,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 99% rename from patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch index 4dd13ff..1fb6b57 100644 --- a/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch +++ b/patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch @@ -83,7 +83,7 @@ index b5cb700e2cd1de2f78ad582245208c056fa6fa79..80123dd30328336b02a5e2e3414ece44 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 d5ad15b95a4f1a0145821ca8a6362e4d5722bf7b..577a194e9d9828520560e3546dba8532ca18782a 100644 +index 8a8ad0952ac5f128aeabc0856426227bfb7b9893..229c3d25a5999b0304b06a57819a5108c823784d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -430,6 +430,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0035-Pufferfish-Optimize-suffocation.patch b/patches/server/0034-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0035-Pufferfish-Optimize-suffocation.patch rename to patches/server/0034-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0035-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch b/patches/server/0036-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch similarity index 100% rename from patches/server/0037-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch rename to patches/server/0036-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch diff --git a/patches/server/0038-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0037-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0038-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0037-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0039-Gale-Optimize-sun-burn-tick.patch b/patches/server/0038-Gale-Optimize-sun-burn-tick.patch similarity index 97% rename from patches/server/0039-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0038-Gale-Optimize-sun-burn-tick.patch index bc246bc..5293e08 100644 --- a/patches/server/0039-Gale-Optimize-sun-burn-tick.patch +++ b/patches/server/0038-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 577a194e9d9828520560e3546dba8532ca18782a..6870db1f03e44e8023e173a0d7a6a7f09f41e989 100644 +index 229c3d25a5999b0304b06a57819a5108c823784d..9994b61afcaa9cb93bda9f1e1db17708d95277fa 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -315,7 +315,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0041-Gale-Use-platform-math-functions.patch b/patches/server/0039-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0041-Gale-Use-platform-math-functions.patch rename to patches/server/0039-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0040-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 92% rename from patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0040-Gale-Skip-entity-move-if-movement-is-zero.patch index 2de8335..c08f2cc 100644 --- a/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0040-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 928f53951b2c47fb0a5dbae4dc6b8b97f78f4555..ceb0bf3071865c85dfa5a270150ff487c2c02c4c 100644 +index 9994b61afcaa9cb93bda9f1e1db17708d95277fa..45871e846223dc78aee8a8ffb087b0f0763dca67 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -28,7 +28,7 @@ index 928f53951b2c47fb0a5dbae4dc6b8b97f78f4555..ceb0bf3071865c85dfa5a270150ff487 final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -4978,6 +4984,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4977,6 +4983,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public final void setBoundingBox(AABB boundingBox) { diff --git a/patches/server/0043-Gale-Optimize-noise-generation.patch b/patches/server/0041-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0043-Gale-Optimize-noise-generation.patch rename to patches/server/0041-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0044-Gale-Faster-chunk-serialization.patch b/patches/server/0042-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0044-Gale-Faster-chunk-serialization.patch rename to patches/server/0042-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0043-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0043-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0044-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0046-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0044-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0045-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0045-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0046-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0048-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0046-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0047-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0049-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0047-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 99% rename from patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch index 66bb7b8..810474a 100644 --- a/patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch +++ b/patches/server/0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch @@ -332,10 +332,10 @@ index 1859477e96709368683fe5707327e92f56fbfc8e..4c4814094552fa4382b1cbe649f24f47 + // KioCG end } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ceb0bf3071865c85dfa5a270150ff487c2c02c4c..ae39e58170085f83303d53eb6b7eb72f0a961be3 100644 +index 45871e846223dc78aee8a8ffb087b0f0763dca67..d860f32f507cc4d642213a6da8227314660c4ca0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -5999,4 +5999,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -5856,4 +5856,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this); } // Paper end - Expose entity id counter diff --git a/patches/server/0051-Purpur-use-alternative-keep-alive.patch b/patches/server/0049-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0051-Purpur-use-alternative-keep-alive.patch rename to patches/server/0049-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0052-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0050-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0052-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0050-Leaf-Skip-event-if-no-listeners.patch diff --git a/patches/server/0053-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0051-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0053-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0051-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0054-Fix-MC-2025.patch b/patches/server/0052-Fix-MC-2025.patch similarity index 95% rename from patches/server/0054-Fix-MC-2025.patch rename to patches/server/0052-Fix-MC-2025.patch index ac9df28..ef533c1 100644 --- a/patches/server/0054-Fix-MC-2025.patch +++ b/patches/server/0052-Fix-MC-2025.patch @@ -5,7 +5,7 @@ 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 ae39e58170085f83303d53eb6b7eb72f0a961be3..133fd4c50df80420015d0c32f487f0176ad07393 100644 +index d860f32f507cc4d642213a6da8227314660c4ca0..8e64056ed83a08037e9c5a06a03233600671637b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2623,6 +2623,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0055-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0053-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0055-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0053-FoliaPR-Add-TPS-From-Region.patch