Merge pull request #76 from Suisuroru/dev/1.21.4-hardfork-raid-fix-250419

Raid revert | MC-274911

luminol-api/paper-patches/features/0007-Tick-regions-api.patch

@@ -186,10 +186,10 @@ index 0000000000000000000000000000000000000000..ecde4462b08d701b8bff9f26902f1775
 +    RegionStats getRegionStats();
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 015d852d5a0c01042a2153a6916d408660356c59..c7b6f3f6c42746297816c0650571990f565d5e68 100644
+index bff01411f4b2d3ecd9e6d807c3f450d72c108323..1d74f4814d5c87d6cd1320634e5610cac16d32c5 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4432,4 +4432,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4437,4 +4437,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
              }
          }
      }

luminol-server/minecraft-patches/features/0016-Add-config-for-tripwire-dupe.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
 Date: Mon, 24 Feb 2025 06:00:00 -0800
-Subject: [PATCH] Configurable tripwire dupe
+Subject: [PATCH] Add config for tripwire dupe
 
 
 diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java

luminol-server/minecraft-patches/features/0024-Fully-removed-player-teleport-event-and-entity-telep.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Sat, 19 Apr 2025 20:38:20 +0800
+Subject: [PATCH] Fully removed player teleport event and entity teleport event
+ call
+
+
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index a107d9ee24d0e39ce3e3e09bf27af1ea4ae35b96..e786177f9e36c1dfb0cdcfc641ab2e36d42f2451 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1764,7 +1764,7 @@ public class ServerGamePacketListenerImpl
+             final io.papermc.paper.entity.TeleportFlag.Relative flag = org.bukkit.craftbukkit.entity.CraftPlayer.deltaRelativeToAPI(relativeArgument);
+             if (flag != null) relativeFlags.add(flag);
+         }
+-        PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause, java.util.Set.copyOf(relativeFlags));
++        /*PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause, java.util.Set.copyOf(relativeFlags)); // Luminol - Fully remove EntityTeleportEvent and PlayerTeleportEvent
+         // Paper end - Teleport API
+         this.cserver.getPluginManager().callEvent(event);
+ 
+@@ -1773,9 +1773,10 @@ public class ServerGamePacketListenerImpl
+             to = event.isCancelled() ? event.getFrom() : event.getTo();
+             posMoveRotation = new PositionMoveRotation(CraftLocation.toVec3D(to), Vec3.ZERO, to.getYaw(), to.getPitch());
+         }
++        */ // Luminol - Fully remove EntityTeleportEvent and PlayerTeleportEvent
+ 
+         this.internalTeleport(posMoveRotation, relatives);
+-        return !event.isCancelled(); // CraftBukkit - Return event status
++        return true; //!event.isCancelled(); // CraftBukkit - Return event status // Luminol - Fully remove EntityTeleportEvent and PlayerTeleportEvent
+     }
+ 
+     public void teleport(Location dest) {
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 6258b008ad3e00d41e9f3014572d6f7a06b1847c..1981f8e9e158ba7874dd3c9bde127654d56170ce 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
++++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -4226,7 +4226,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+                 this.setPos(x1, y1, z1);
+ 
+                 if (flag) {
+-                    if (!(this instanceof ServerPlayer)) {
++                    if (!(this instanceof ServerPlayer) && false) { // Luminol - Fully remove EntityTeleportEvent and PlayerTeleportEvent
+                         EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), new Location(this.level().getWorld(), x1, y1, z1), new Location(this.level().getWorld(), x, d, z));
+                         this.level().getCraftServer().getPluginManager().callEvent(teleport);
+                         if (!teleport.isCancelled() && teleport.getTo() != null) { // Paper

luminol-server/minecraft-patches/features/0030-Purpur-Barrels-and-enderchests-6-rows.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur-Barrels-and-enderchests-6-rows
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 27478c973dc2e9ea2495f5b27127ef085bc5cdf3..9777a5b7ba9916e426ba87d6ee7cd56f0e43c195 100644
+index 751b011701d6ae373099226ea63ffbafcd24ce6a..e5e946462da9e56344428139768075b7bd228ec0 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -1103,6 +1103,10 @@ public abstract class PlayerList {
@@ -20,7 +20,7 @@ index 27478c973dc2e9ea2495f5b27127ef085bc5cdf3..9777a5b7ba9916e426ba87d6ee7cd56f
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index ad34d0e1ab16fb269b3cec2842bfc2f2c29b452e..40b91234fd2e4f4f134d309590ea6b605f764e83 100644
+index ae049c5c3593525b991d865fec695c00ad408a59..c6252a245e9701f69db1fe167f6590095237553a 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
 @@ -200,6 +200,7 @@ public abstract class Player extends LivingEntity {

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

@@ -18,7 +18,7 @@ index c260741a87513b89a5cc62c543fb9f990f86491e..beb9b3b3cd5ca60bd2cdada937bff8a1
              }
              if (entity instanceof final Mob mob && mob.getTarget() != null) {
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 6258b008ad3e00d41e9f3014572d6f7a06b1847c..2293c3db45e9ecce4e0d4b2f87b8e90228e44d94 100644
+index 1981f8e9e158ba7874dd3c9bde127654d56170ce..af903ff99441e56402278dfab069a056ce54b6c3 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -2044,6 +2044,20 @@ public abstract class LivingEntity extends Entity implements Attackable {

luminol-server/minecraft-patches/features/0042-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Leaf Remove useless creating stats json bases on player name
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 751b011701d6ae373099226ea63ffbafcd24ce6a..27478c973dc2e9ea2495f5b27127ef085bc5cdf3 100644
+index e5e946462da9e56344428139768075b7bd228ec0..9777a5b7ba9916e426ba87d6ee7cd56f0e43c195 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1416,6 +1416,8 @@ public abstract class PlayerList {
+@@ -1420,6 +1420,8 @@ public abstract class PlayerList {
          if (serverStatsCounter == null) {
              File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
              File file1 = new File(file, uuid + ".json");
@@ -18,7 +18,7 @@ index 751b011701d6ae373099226ea63ffbafcd24ce6a..27478c973dc2e9ea2495f5b27127ef08
              if (!file1.exists()) {
                  File file2 = new File(file, displayName + ".json"); // CraftBukkit
                  Path path = file2.toPath();
-@@ -1423,6 +1425,8 @@ public abstract class PlayerList {
+@@ -1427,6 +1429,8 @@ public abstract class PlayerList {
                      file2.renameTo(file1);
                  }
              }

luminol-server/minecraft-patches/features/0045-Leaf-Smart-sort-entities-in-NearestLivingEntitySenso.patch

@@ -0,0 +1,125 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Fri, 18 Apr 2025 22:04:20 +0800
+Subject: [PATCH] Leaf Smart sort entities in NearestLivingEntitySensor
+
+
+diff --git a/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java b/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
+index b0c5e41fefc7c9adf1a61bd5b52861736657d37e..b91c4aa042f6ac10e402bcf16a03d24d6dafec86 100644
+--- a/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
++++ b/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
+@@ -13,18 +13,107 @@ import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities;
+ import net.minecraft.world.phys.AABB;
+ 
+ public class NearestLivingEntitySensor<T extends LivingEntity> extends Sensor<T> {
++
++    // Leaf start - Optimized entity sorting with buffer reuse
++    private static final int SMALL_ARRAY_THRESHOLD = 2;
++    private final ThreadLocal<LivingEntity[]> entityBuffer = ThreadLocal.withInitial(() -> new LivingEntity[0]);
++    private final ThreadLocal<long[]> bitsBuffer = ThreadLocal.withInitial(() -> new long[0]);
++
+     @Override
+     protected void doTick(ServerLevel level, T entity) {
+-        double attributeValue = entity.getAttributeValue(Attributes.FOLLOW_RANGE);
+-        AABB aabb = entity.getBoundingBox().inflate(attributeValue, attributeValue, attributeValue);
+-        List<LivingEntity> entitiesOfClass = level.getEntitiesOfClass(
+-            LivingEntity.class, aabb, matchableEntity -> matchableEntity != entity && matchableEntity.isAlive()
++        double range = entity.getAttributeValue(Attributes.FOLLOW_RANGE);
++        double rangeSqr = range * range;
++        AABB aabb = entity.getBoundingBox().inflate(range, range, range);
++
++        List<LivingEntity> entities = level.getEntitiesOfClass(
++            LivingEntity.class, aabb, e -> e != entity && e.isAlive() && entity.distanceToSqr(e) <= rangeSqr
+         );
+-        entitiesOfClass.sort(Comparator.comparingDouble(entity::distanceToSqr));
++
++        LivingEntity[] sorted = smartSort(entities, entity);
++        List<LivingEntity> sortedList = java.util.Arrays.asList(sorted);
++
+         Brain<?> brain = entity.getBrain();
+-        brain.setMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES, entitiesOfClass);
+-        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, new NearestVisibleLivingEntities(level, entity, entitiesOfClass));
++        brain.setMemory(MemoryModuleType.NEAREST_LIVING_ENTITIES, sortedList);
++        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES,
++            new NearestVisibleLivingEntities(level, entity, sortedList));
++    }
++
++    private LivingEntity[] smartSort(List<LivingEntity> entities, T reference) {
++        int size = entities.size();
++        if (size <= 1) return entities.toArray(new LivingEntity[0]);
++
++        LivingEntity[] entityBufferArray = this.entityBuffer.get();
++        long[] bitsBufferArray = this.bitsBuffer.get();
++        if (entityBufferArray.length < size) {
++            entityBufferArray = new LivingEntity[size];
++            entityBuffer.set(entityBufferArray);
++
++            bitsBufferArray = new long[size];
++            bitsBuffer.set(bitsBufferArray);
++        }
++
++        for (int i = 0; i < size; i++) {
++            LivingEntity e = entities.get(i);
++            entityBufferArray[i] = e;
++            bitsBufferArray[i] = Double.doubleToRawLongBits(reference.distanceToSqr(e));
++        }
++
++        fastRadixSort(entityBufferArray, bitsBufferArray, 0, size - 1, 62);
++
++        return java.util.Arrays.copyOf(entityBufferArray, size);
++    }
++
++    private void fastRadixSort(LivingEntity[] ents, long[] bits, int low, int high, int bit) {
++        if (bit < 0 || low >= high) return;
++
++        if (high - low <= SMALL_ARRAY_THRESHOLD) {
++            insertionSort(ents, bits, low, high);
++            return;
++        }
++
++        int i = low, j = high;
++        final long mask = 1L << bit;
++
++        while (i <= j) {
++            while (i <= j && (bits[i] & mask) == 0) i++;
++            while (i <= j && (bits[j] & mask) != 0) j--;
++
++            if (i < j) {
++                swap(ents, bits, i++, j--);
++            }
++        }
++
++        if (low < j) fastRadixSort(ents, bits, low, j, bit - 1);
++        if (i < high) fastRadixSort(ents, bits, i, high, bit - 1);
++    }
++
++    private void insertionSort(LivingEntity[] ents, long[] bits, int low, int high) {
++        for (int i = low + 1; i <= high; i++) {
++            int j = i;
++            LivingEntity e = ents[j];
++            long b = bits[j];
++
++            while (j > low && bits[j - 1] > b) {
++                ents[j] = ents[j - 1];
++                bits[j] = bits[j - 1];
++                j--;
++            }
++
++            ents[j] = e;
++            bits[j] = b;
++        }
++    }
++
++    private void swap(LivingEntity[] ents, long[] bits, int a, int b) {
++        LivingEntity te = ents[a];
++        ents[a] = ents[b];
++        ents[b] = te;
++
++        long tb = bits[a];
++        bits[a] = bits[b];
++        bits[b] = tb;
+     }
++    // Leaf end - Optimized entity sorting with buffer reuse
+ 
+     @Override
+     public Set<MemoryModuleType<?>> requires() {

luminol-server/minecraft-patches/features/0048-Leaves-Disable-moved-wrongly-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Disable moved wrongly threshold
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a107d9ee24d0e39ce3e3e09bf27af1ea4ae35b96..225045400f152a9a8f030d6fe367764b00d99b24 100644
+index e786177f9e36c1dfb0cdcfc641ab2e36d42f2451..8a4183b1c4c3e7be568e6ede3b319447bf83049b 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -581,7 +581,7 @@ public class ServerGamePacketListenerImpl

luminol-server/minecraft-patches/features/0050-Raytracing-tracker-experiment.patch

@@ -93,10 +93,10 @@ index d9cc1d7e56c37d5ce92544edc10e89dbc89dd15d..39e7689be243b9c99b507d665f659135
      public EntityType(
          EntityType.EntityFactory<T> factory,
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2c29b452e 100644
+index c6252a245e9701f69db1fe167f6590095237553a..40b91234fd2e4f4f134d309590ea6b605f764e83 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -210,6 +210,25 @@ public abstract class Player extends LivingEntity {
+@@ -211,6 +211,25 @@ public abstract class Player extends LivingEntity {
          return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -122,7 +122,7 @@ index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2
  
      public Player(Level level, BlockPos pos, float yRot, GameProfile gameProfile) {
          super(EntityType.PLAYER, level);
-@@ -262,6 +281,26 @@ public abstract class Player extends LivingEntity {
+@@ -263,6 +282,26 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public void tick() {
@@ -149,7 +149,7 @@ index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2
          this.noPhysics = this.isSpectator();
          if (this.isSpectator() || this.isPassenger()) {
              this.setOnGround(false);
-@@ -1504,6 +1543,7 @@ public abstract class Player extends LivingEntity {
+@@ -1505,6 +1544,7 @@ public abstract class Player extends LivingEntity {
          if (this.containerMenu != null && this.hasContainerOpen()) {
              this.doCloseContainer();
          }

luminol-server/minecraft-patches/features/0051-Disable-Heightmap-Warning.patch

@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 13 Apr 2025 11:07:04 +0800
+Subject: [PATCH] Disable Heightmap Warning
+
+
+diff --git a/net/minecraft/world/level/levelgen/Heightmap.java b/net/minecraft/world/level/levelgen/Heightmap.java
+index 3b27bcfbbe0529d1526adc30760c846b4011645f..95747ae41cea0d4b577c58ef44959a18e0a46672 100644
+--- a/net/minecraft/world/level/levelgen/Heightmap.java
++++ b/net/minecraft/world/level/levelgen/Heightmap.java
+@@ -123,7 +123,8 @@ public class Heightmap {
+         if (raw.length == data.length) {
+             System.arraycopy(data, 0, raw, 0, data.length);
+         } else {
+-            LOGGER.warn("Ignoring heightmap data for chunk " + chunk.getPos() + ", size does not match; expected: " + raw.length + ", got: " + data.length);
++            if (!me.earthme.luminol.config.modules.misc.DisableHeightmapWarnConfig.enabled)
++                LOGGER.warn("Ignoring heightmap data for chunk " + chunk.getPos() + ", size does not match; expected: " + raw.length + ", got: " + data.length);
+             primeHeightmaps(chunk, EnumSet.of(type));
+         }
+     }

luminol-server/minecraft-patches/features/0052-Leaves-Revert-raid-changes.patch

@@ -21,10 +21,83 @@ index 80f17f33f670018240c854df589cf90cdeab6e70..8672757a4d5fb5c247599782fece6b8d
              if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) {
                  serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier));
 diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java
-index 2f45befbb50645f1bfb5961ad725f3670ff0d592..84c6eb2c27510938f590f6c6baa5a94c4c08c4ad 100644
+index 2f45befbb50645f1bfb5961ad725f3670ff0d592..4e2ec7f7946a70b676393f090c5ce6219314c3da 100644
 --- a/net/minecraft/world/entity/raid/Raid.java
 +++ b/net/minecraft/world/entity/raid/Raid.java
-@@ -674,7 +674,7 @@ public class Raid {
+@@ -109,6 +109,12 @@ public class Raid {
+     private static final org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry PDC_TYPE_REGISTRY = new org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry();
+     public final org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer persistentDataContainer = new org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer(PDC_TYPE_REGISTRY);
+     // Paper end
++    // Luminol Start - Raid revert
++    private boolean flagForceWin = false;
++    private boolean flag274911 = false;
++    private int freshTick = 0;
++    private int retryTimes = 0;
++    // Luminol End - Raid revert
+ 
+     // Folia start - make raids thread-safe
+     public boolean ownsRaid() {
+@@ -270,7 +276,36 @@ public class Raid {
+     }
+ 
+     public void tick() {
+-        if (!this.isStopped()) {
++        // Luminol Start - Raid revert
++        if (this.flag274911) {
++            if (this.freshTick == 20) {
++                if (this.waveSpawnPos.isPresent() && !this.level.isPositionEntityTicking(this.waveSpawnPos.get())) {
++                    this.waveSpawnPos = this.getValidSpawnPos();
++                }
++
++                BlockPos blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(20));
++                if (blockPos != null && retryTimes < 3) {
++                    this.started = true;
++                    this.spawnGroup(blockPos);
++                    this.retryTimes = 0;
++                } else if (retryTimes == 3) {
++                    this.waveSpawnPos = Optional.empty();
++                    this.groupsSpawned++;
++                    this.retryTimes = 0;
++                } else {
++                    this.retryTimes++;
++                }
++                if (!this.hasMoreWaves()) {
++                    this.flag274911 = false;
++                    this.flagForceWin = true;
++                }
++                this.freshTick = 0;
++            } else {
++                this.freshTick++;
++            }
++            return;
++        }
++        if (!this.isStopped() || this.flagForceWin) { // Luminol End - Raid revert
+             if (this.status == Raid.RaidStatus.ONGOING) {
+                 boolean flag = this.active;
+                 this.active = this.level.hasChunkAt(this.center);
+@@ -288,6 +323,12 @@ public class Raid {
+                     return;
+                 }
+ 
++                // Luminol Start - Raid revert
++                if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.revert_274911 && this.waveSpawnPos.isPresent() && this.center.distSqr(this.waveSpawnPos.get()) >= 12544) {
++                    this.flag274911 = true;
++                }
++                // Luminol End - Raid revert
++
+                 if (!this.level.isVillage(this.center)) {
+                     this.moveRaidCenterToNearbyVillageSection();
+                 }
+@@ -379,7 +420,7 @@ public class Raid {
+                     }
+                 }
+ 
+-                if (this.isStarted() && !this.hasMoreWaves() && totalRaidersAlive == 0) {
++                if (this.flagForceWin || (this.isStarted() && !this.hasMoreWaves() && totalRaidersAlive == 0)) { // Luminol - Raid revert
+                     if (this.postRaidTicks < 40) {
+                         this.postRaidTicks++;
+                     } else {
+@@ -674,7 +715,7 @@ public class Raid {
              int i2 = this.center.getX() + Mth.floor(Mth.cos(f2) * 32.0F * f) + this.level.random.nextInt(3) * Mth.floor(f);
              int i3 = this.center.getZ() + Mth.floor(Mth.sin(f2) * 32.0F * f) + this.level.random.nextInt(3) * Mth.floor(f);
              int height = this.level.getHeight(Heightmap.Types.WORLD_SURFACE, i2, i3);
@@ -34,7 +107,7 @@ index 2f45befbb50645f1bfb5961ad725f3670ff0d592..84c6eb2c27510938f590f6c6baa5a94c
                  if (!this.level.isVillage(mutableBlockPos) || i <= 7) {
                      int i4 = 10;
 diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index 7c385baae81b9a987c0e1e4deb017884600331bc..a0d86c3cc86da734a3cd10d554aaecb5c0b82e59 100644
+index 7c385baae81b9a987c0e1e4deb017884600331bc..262291eaeb9bc250affeda67957588d14ec1eebc 100644
 --- a/net/minecraft/world/entity/raid/Raider.java
 +++ b/net/minecraft/world/entity/raid/Raider.java
 @@ -125,6 +125,43 @@ public abstract class Raider extends PatrollingMonster {
@@ -81,6 +154,15 @@ index 7c385baae81b9a987c0e1e4deb017884600331bc..a0d86c3cc86da734a3cd10d554aaecb5
          }
  
          super.die(cause);
+@@ -153,7 +190,7 @@ public abstract class Raider extends PatrollingMonster {
+     }
+ 
+     public boolean hasRaid() {
+-        return this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null);
++        return !me.earthme.luminol.config.modules.misc.RaidChangesConfig.self_check && (this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null)); // Leaves - Disable raid self check
+     }
+ 
+     public boolean hasActiveRaid() {
 diff --git a/net/minecraft/world/item/component/OminousBottleAmplifier.java b/net/minecraft/world/item/component/OminousBottleAmplifier.java
 index 318f24d67be4daf6993ba547da0540be9c221a75..9a6820fce3977419fd81d802720c318ac15d07c4 100644
 --- a/net/minecraft/world/item/component/OminousBottleAmplifier.java

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/DisableHeightmapWarnConfig.java.patch

@@ -0,0 +1,25 @@
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/config/modules/misc/DisableHeightmapWarnConfig.java
+@@ -1,0 +_,22 @@
++package me.earthme.luminol.config.modules.misc;
++
++import me.earthme.luminol.config.ConfigInfo;
++import me.earthme.luminol.config.EnumConfigCategory;
++import me.earthme.luminol.config.IConfigModule;
++
++public class DisableHeightmapWarnConfig implements IConfigModule {
++    @ConfigInfo(baseName = "enabled", comments =
++            """
++                    Disable heightmap-check's warning""")
++    public static boolean enabled = false;
++
++    @Override
++    public EnumConfigCategory getCategory() {
++        return EnumConfigCategory.MISC;
++    }
++
++    @Override
++    public String getBaseName() {
++        return "heightmap_warn_disable";
++    }
++}

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch

@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java
-@@ -1,0 +_,41 @@
+@@ -1,0 +_,52 @@
 +package me.earthme.luminol.config.modules.misc;
 +
 +import me.earthme.luminol.config.ConfigInfo;
@@ -10,28 +10,39 @@
 +public class RaidChangesConfig implements IConfigModule {
 +    @ConfigInfo(baseName = "allow-bad-omen-trigger-raid", comments =
 +            """
-+                    Allow players with ominous signs to\s
-+                    skip a 30-second cooldown and trigger\s
-+                    attacks directly""")
++                    Allow players with ominous signs to skip a\s
++                    30-second cooldown and trigger attacks directly""")
 +    public static boolean trigger = false;
 +
 +    @ConfigInfo(baseName = "give-bad-omen-when-kill-patrol-leader", comments =
 +            """
-+                    Enable players to obtain an ominous\s
-+                    omen effect when killing the patrol\s
-+                    team captain""")
++                    Enable players to obtain an ominous omen\s
++                    effect when killing the patrol team captain""")
 +    public static boolean effect = false;
 +
 +    @ConfigInfo(baseName = "bad-omen-infinite", comments =
 +            """
-+                    Enable bad omen effect infinite time.""")
++                    Enable bad omen effect infinite time
++                        --- this config is not old version's function""")
 +    public static boolean infinite = false;
 +
 +    @ConfigInfo(baseName = "skip-height-check", comments =
 +            """
-+                    disable y <= 96 check.""")
++                    Disable y <= 96 check""")
 +    public static boolean height_check = false;
 +
++    @ConfigInfo(baseName = "skip-self-raid-check", comments =
++            """
++                    Disable raid self check\s
++                        --- this config is not old version's function""")
++    public static boolean self_check = false;
++
++    @ConfigInfo(baseName = "revert-274911", comments =
++            """
++                    Revert MC-274911(hard-revert)
++                        --- maybe have some bugs""")
++    public static boolean revert_274911 = false;
++
 +    @Override
 +    public EnumConfigCategory getCategory() {
 +        return EnumConfigCategory.MISC;