diff --git a/patches/server/0024-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0023-Pufferfish-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0024-Pufferfish-Improve-fluid-direction-caching.patch rename to patches/server/0023-Pufferfish-Improve-fluid-direction-caching.patch diff --git a/patches/server/0023-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch b/patches/server/0023-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch deleted file mode 100644 index 28d9539..0000000 --- a/patches/server/0023-Pufferfish-Make-EntityCollisionContext-a-live-repres.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Paul Sauve -Date: Sun, 9 May 2021 18:35:05 -0500 -Subject: [PATCH] Pufferfish Make EntityCollisionContext a live representation - - -diff --git a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java -index 88a4a72bb390947dc17e5da09a99b2d1b3ac4621..284c76ddb9724b44bb2e93f590685c728e843e6d 100644 ---- a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java -+++ b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java -@@ -17,50 +17,69 @@ public class EntityCollisionContext implements CollisionContext { - return defaultValue; - } - }; -- private final boolean descending; -- private final double entityBottom; -- private final ItemStack heldItem; -- private final Predicate canStandOnFluid; -+ // Pufferfish start - remove these and pray no plugin uses them -+ // private final boolean descending; -+ // private final double entityBottom; -+ // private final ItemStack heldItem; -+ // private final Predicate canStandOnFluid; -+ // Pufferfish end - @Nullable - private final Entity entity; - - protected EntityCollisionContext(boolean descending, double minY, ItemStack heldItem, Predicate walkOnFluidPredicate, @Nullable Entity entity) { -- this.descending = descending; -- this.entityBottom = minY; -- this.heldItem = heldItem; -- this.canStandOnFluid = walkOnFluidPredicate; -+ // Pufferfish start - remove these -+ // this.descending = descending; -+ // this.entityBottom = minY; -+ // this.heldItem = heldItem; -+ // this.canStandOnFluid = walkOnFluidPredicate; -+ // Pufferfish end - this.entity = entity; - } - - @Deprecated - protected EntityCollisionContext(Entity entity) { -- this( -- entity.isDescending(), -- entity.getY(), -- entity instanceof LivingEntity ? ((LivingEntity)entity).getMainHandItem() : ItemStack.EMPTY, -- entity instanceof LivingEntity ? ((LivingEntity)entity)::canStandOnFluid : fluidState -> false, -- entity -- ); -+ // Pufferfish start - remove this -+ // this( -+ // entity.isDescending(), -+ // entity.getY(), -+ // entity instanceof LivingEntity ? ((LivingEntity)entity).getMainHandItem() : ItemStack.EMPTY, -+ // entity instanceof LivingEntity ? ((LivingEntity)entity)::canStandOnFluid : fluidState -> false, -+ // entity -+ // ); -+ // Pufferfish end -+ this.entity = entity; - } - - @Override - public boolean isHoldingItem(Item item) { -- return this.heldItem.is(item); -+ // Pufferfish start -+ Entity entity = this.entity; -+ if (entity instanceof LivingEntity livingEntity) { -+ return livingEntity.getMainHandItem().is(item); -+ } -+ return ItemStack.EMPTY.is(item); -+ // Pufferfish end - } - - @Override - public boolean canStandOnFluid(FluidState stateAbove, FluidState state) { -- return this.canStandOnFluid.test(state) && !stateAbove.getType().isSame(state.getType()); -+ // Pufferfish start -+ Entity entity = this.entity; -+ if (entity instanceof LivingEntity livingEntity) { -+ return livingEntity.canStandOnFluid(state) && !stateAbove.getType().isSame(state.getType()); -+ } -+ return false; -+ // Pufferfish end - } - - @Override - public boolean isDescending() { -- return this.descending; -+ return this.entity != null && this.entity.isDescending(); // Pufferfish - } - - @Override - public boolean isAbove(VoxelShape shape, BlockPos pos, boolean defaultValue) { -- return this.entityBottom > (double)pos.getY() + shape.max(Direction.Axis.Y) - 1.0E-5F; -+ return (this.entity == null ? -Double.MAX_VALUE : entity.getY()) > (double)pos.getY() + shape.max(Direction.Axis.Y) - 1.0E-5F; // Pufferfish - } - - @Nullable diff --git a/patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0024-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0025-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0024-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0026-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0025-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0026-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0025-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0027-Pufferfish-Early-return-optimization-for-target-find.patch b/patches/server/0026-Pufferfish-Early-return-optimization-for-target-find.patch similarity index 100% rename from patches/server/0027-Pufferfish-Early-return-optimization-for-target-find.patch rename to patches/server/0026-Pufferfish-Early-return-optimization-for-target-find.patch diff --git a/patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0028-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0029-Pufferfish-Skip-cloning-loot-parameters.patch b/patches/server/0028-Pufferfish-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0029-Pufferfish-Skip-cloning-loot-parameters.patch rename to patches/server/0028-Pufferfish-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0030-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0029-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0030-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0029-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch 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 100% rename from patches/server/0032-Pufferfish-Entity-TTL.patch rename to patches/server/0031-Pufferfish-Entity-TTL.patch diff --git a/patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0033-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch 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 97% rename from patches/server/0038-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0037-Gale-Variable-entity-wake-up-duration.patch index 03b6d4a..475ccce 100644 --- a/patches/server/0038-Gale-Variable-entity-wake-up-duration.patch +++ b/patches/server/0037-Gale-Variable-entity-wake-up-duration.patch @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..fa30e8dc39a2d4bd1399e41230b307b1 + } +} diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index bf38bbd0d0abf5e73c94e0f9d1f4462cccd6a105..af61cfe8330c3aecc348bfe40838d25755621333 100644 +index 4e8892326bfadfb0f1baf672908bc282f11103b1..8b71a68944c80043d979b8eb107c0cc094843fcf 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -75,28 +75,41 @@ public class ActivationRange diff --git a/patches/server/0039-Gale-Optimize-sun-burn-tick.patch b/patches/server/0038-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0039-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0038-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0040-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0039-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0040-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0039-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0041-Gale-Use-platform-math-functions.patch b/patches/server/0040-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0041-Gale-Use-platform-math-functions.patch rename to patches/server/0040-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0043-Gale-Optimize-noise-generation.patch b/patches/server/0042-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0043-Gale-Optimize-noise-generation.patch rename to patches/server/0042-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0044-Gale-Faster-chunk-serialization.patch b/patches/server/0043-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0044-Gale-Faster-chunk-serialization.patch rename to patches/server/0043-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0044-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/0044-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/0045-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/0045-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0046-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0047-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0046-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/0047-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/0047-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/0048-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/0048-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/0049-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/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch index 2476607..aa2487b 100644 --- a/patches/server/0050-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch +++ b/patches/server/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch @@ -425,7 +425,7 @@ index b3377ed06d703f54e01ba174e5a06dc928cdff96..80af7979f9a2078a6c40c958ced1d487 + // KioCG end } diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index bc944fec524d79fd6e5fc01a808e4d13153afc05..095e68ff301a5bbba2eff0a867d0a3df786a5f0f 100644 +index c1b0cf6e09914404d1fcf302af03666342e1dc30..dd6c872b8e655119edab5f978067381a287d70ca 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -429,4 +429,11 @@ public abstract class Projectile extends Entity implements TraceableEntity { diff --git a/patches/server/0051-Purpur-use-alternative-keep-alive.patch b/patches/server/0050-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0051-Purpur-use-alternative-keep-alive.patch rename to patches/server/0050-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0052-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0051-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/0051-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/0052-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/0052-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0054-Fix-MC-2025.patch b/patches/server/0053-Fix-MC-2025.patch similarity index 100% rename from patches/server/0054-Fix-MC-2025.patch rename to patches/server/0053-Fix-MC-2025.patch diff --git a/patches/server/0055-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0054-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0055-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0054-FoliaPR-Add-TPS-From-Region.patch