Merge paper #12047

luminol-server/minecraft-patches/features/0020-Merge-Paper-11945-for-temporary-hopper-behavior-fix.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MrHua269 <wangxyper@163.com>
 Date: Sun, 12 Jan 2025 11:03:09 +0800
-Subject: [PATCH] Merge Paper #11945 for temporary hooper behavior fix
+Subject: [PATCH] Merge Paper #11945 for temporary hopper behavior fix
 
 A hopper optimization fix on Paper's pr : https://github.com/PaperMC/Paper/pull/11945
 

luminol-server/minecraft-patches/features/0022-Merge-paper-12047.patch

@@ -0,0 +1,87 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Fri, 31 Jan 2025 12:54:45 +0800
+Subject: [PATCH] Merge paper #12047
+
+
+diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
+index ba8b5a0ebe652bfaf5c1498c19d12a91a192bf8e..8b661a11ed798186335b4ea6b907eb719cbbf722 100644
+--- a/io/papermc/paper/entity/activation/ActivationRange.java
++++ b/io/papermc/paper/entity/activation/ActivationRange.java
+@@ -40,10 +40,10 @@ public final class ActivationRange {
+     }
+ 
+     static Activity[] VILLAGER_PANIC_IMMUNITIES = {
+-        Activity.HIDE,
+-        Activity.PRE_RAID,
+-        Activity.RAID,
+-        Activity.PANIC
++            Activity.HIDE,
++            Activity.PRE_RAID,
++            Activity.RAID,
++            Activity.PANIC
+     };
+ 
+     private static int checkInactiveWakeup(final Entity entity) {
+@@ -85,28 +85,28 @@ public final class ActivationRange {
+      * @return boolean If it should always tick.
+      */
+     public static boolean initializeEntityActivationState(final Entity entity, final SpigotWorldConfig config) {
+-        return (entity.activationType == ActivationType.MISC && config.miscActivationRange == 0)
+-            || (entity.activationType == ActivationType.RAIDER && config.raiderActivationRange == 0)
+-            || (entity.activationType == ActivationType.ANIMAL && config.animalActivationRange == 0)
+-            || (entity.activationType == ActivationType.MONSTER && config.monsterActivationRange == 0)
+-            || (entity.activationType == ActivationType.VILLAGER && config.villagerActivationRange <= 0)
+-            || (entity.activationType == ActivationType.WATER && config.waterActivationRange <= 0)
+-            || (entity.activationType == ActivationType.FLYING_MONSTER && config.flyingMonsterActivationRange <= 0)
+-            || entity instanceof EyeOfEnder
+-            || entity instanceof Player
+-            || entity instanceof ThrowableProjectile
+-            || entity instanceof EnderDragon
+-            || entity instanceof EnderDragonPart
+-            || entity instanceof WitherBoss
+-            || entity instanceof AbstractHurtingProjectile
+-            || entity instanceof LightningBolt
+-            || entity instanceof PrimedTnt
+-            || entity instanceof net.minecraft.world.entity.item.FallingBlockEntity
+-            || entity instanceof net.minecraft.world.entity.vehicle.AbstractMinecart
+-            || entity instanceof net.minecraft.world.entity.vehicle.AbstractBoat
+-            || entity instanceof EndCrystal
+-            || entity instanceof FireworkRocketEntity
+-            || entity instanceof ThrownTrident;
++        return (entity.activationType == ActivationType.MISC && config.miscActivationRange <= 0) // Luminol - Merge paper #12047
++                || (entity.activationType == ActivationType.RAIDER && config.raiderActivationRange <= 0) // Luminol - Merge paper #12047
++                || (entity.activationType == ActivationType.ANIMAL && config.animalActivationRange <= 0) // Luminol - Merge paper #12047
++                || (entity.activationType == ActivationType.MONSTER && config.monsterActivationRange <= 0) // Luminol - Merge paper #12047
++                || (entity.activationType == ActivationType.VILLAGER && config.villagerActivationRange <= 0)
++                || (entity.activationType == ActivationType.WATER && config.waterActivationRange <= 0)
++                || (entity.activationType == ActivationType.FLYING_MONSTER && config.flyingMonsterActivationRange <= 0)
++                || entity instanceof EyeOfEnder
++                || entity instanceof Player
++                || entity instanceof ThrowableProjectile
++                || entity instanceof EnderDragon
++                || entity instanceof EnderDragonPart
++                || entity instanceof WitherBoss
++                || entity instanceof AbstractHurtingProjectile
++                || entity instanceof LightningBolt
++                || entity instanceof PrimedTnt
++                || entity instanceof net.minecraft.world.entity.item.FallingBlockEntity
++                || entity instanceof net.minecraft.world.entity.vehicle.AbstractMinecart
++                || entity instanceof net.minecraft.world.entity.vehicle.AbstractBoat
++                || entity instanceof EndCrystal
++                || entity instanceof FireworkRocketEntity
++                || entity instanceof ThrownTrident;
+     }
+ 
+     /**
+@@ -234,8 +234,8 @@ public final class ActivationRange {
+             if (entity instanceof final Bee bee) {
+                 final BlockPos movingTarget = bee.getMovingTarget();
+                 if (bee.isAngry() ||
+-                    (bee.getHivePos() != null && bee.getHivePos().equals(movingTarget)) ||
+-                    (bee.getSavedFlowerPos() != null && bee.getSavedFlowerPos().equals(movingTarget))
++                        (bee.getHivePos() != null && bee.getHivePos().equals(movingTarget)) ||
++                        (bee.getSavedFlowerPos() != null && bee.getSavedFlowerPos().equals(movingTarget))
+                 ) {
+                     return 20;
+                 }

luminol-server/minecraft-patches/features/0030-Pufferfish-Cache-climbing-check-for-activation.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish Cache climbing check for activation
 
 
 diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
-index ba8b5a0ebe652bfaf5c1498c19d12a91a192bf8e..76e0b50b2dc9c718a67f89de720a891b398cec2a 100644
+index 8b661a11ed798186335b4ea6b907eb719cbbf722..956807b34d5fda666966d23d46a7ae4ec5055071 100644
 --- a/io/papermc/paper/entity/activation/ActivationRange.java
 +++ b/io/papermc/paper/entity/activation/ActivationRange.java
 @@ -225,7 +225,7 @@ public final class ActivationRange {

luminol-server/minecraft-patches/features/0033-Gale-Variable-entity-wake-up-duration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Variable entity wake-up duration
 
 
 diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
-index 76e0b50b2dc9c718a67f89de720a891b398cec2a..e3d2371e36b48bb820931394e5b4182152f57630 100644
+index 956807b34d5fda666966d23d46a7ae4ec5055071..3a1c4f9f44026dcff7f4a32bb3ceaf79963389ed 100644
 --- a/io/papermc/paper/entity/activation/ActivationRange.java
 +++ b/io/papermc/paper/entity/activation/ActivationRange.java
 @@ -54,27 +54,39 @@ public final class ActivationRange {

luminol-server/paper-patches/features/0021-Merge-paper-12047.patch

@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Fri, 31 Jan 2025 12:54:46 +0800
+Subject: [PATCH] Merge paper #12047
+
+
+diff --git a/src/main/java/io/papermc/paper/entity/activation/ActivationType.java b/src/main/java/io/papermc/paper/entity/activation/ActivationType.java
+index 01fef8353934f22a5176e731847d3df4a7df5306..f707c982ce1f650eaf8c6501b816bb5717cb0a45 100644
+--- a/src/main/java/io/papermc/paper/entity/activation/ActivationType.java
++++ b/src/main/java/io/papermc/paper/entity/activation/ActivationType.java
+@@ -28,7 +28,7 @@ public enum ActivationType {
+      * @return activation type
+      */
+     public static ActivationType activationTypeFor(final Entity entity) {
+-        if (entity instanceof WaterAnimal) {
++        if (entity instanceof WaterAnimal || entity instanceof net.minecraft.world.entity.animal.AgeableWaterCreature) { // Luminol - Merge paper #12047
+             return ActivationType.WATER;
+         } else if (entity instanceof Villager) {
+             return ActivationType.VILLAGER;
+@@ -44,4 +44,4 @@ public enum ActivationType {
+             return ActivationType.MISC;
+         }
+     }
+-}
++}
+\ No newline at end of file