Merge branch 'master' into dev/new-command

# Conflicts:
#	leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java

leaves-server/minecraft-patches/features/0056-Raider-die-skip-self-raid-check.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Sun, 9 Jul 2023 16:51:47 +0800
-Subject: [PATCH] Raider die skip self raid check
-
-
-diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index a495789b2d21fa9a24d5dca4ecfa196ddce49466..7b697f1dfe8131296ef55cd88a8b9d7cd884eb44 100644
---- a/net/minecraft/world/entity/raid/Raider.java
-+++ b/net/minecraft/world/entity/raid/Raider.java
-@@ -156,7 +156,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 !org.leavesmc.leaves.LeavesConfig.modify.skipSelfRaidCheck && (this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null));  // Leaves - skip self raid check
-     }
- 
-     public boolean hasActiveRaid() {

leaves-server/minecraft-patches/features/0066-Check-frozen-ticks-before-landing-block.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index c25cdcebfdd2697da927d55420ab9f02bd4c792a..305c099d32f1472a6e8909cdf2a53cec8a31afb5 100644
+index 9c85639394826f7e683d67e53c1be8cdf9369a78..1bf4cda041189aa5ac67be4a1bda312620788388 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -537,10 +537,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin

leaves-server/minecraft-patches/features/0072-Replay-Mod-API.patch

@@ -181,7 +181,7 @@ index c6ae34f91b3629990294fc5e69237a1e600ef038..2109b0a2d4099e64c34cd1c45b83f726
              org.bukkit.entity.Player sender = (org.bukkit.entity.Player) source.getBukkitSender();
              playersTemp = playersTemp.stream().filter((ep) -> sender.canSee(ep.getBukkitEntity())).collect(java.util.stream.Collectors.toList());
 diff --git a/net/minecraft/server/commands/OpCommand.java b/net/minecraft/server/commands/OpCommand.java
-index f2286b96b8f40b4588f817913c42ae7b4a92340f..dbe6c37642d35ac6ee8b428cf1e45878a5dfa9da 100644
+index e6c7bbb023000b9de90c1256274ff5aba4a6478a..98f8804d58616592332e2a968282be6ad8903ea8 100644
 --- a/net/minecraft/server/commands/OpCommand.java
 +++ b/net/minecraft/server/commands/OpCommand.java
 @@ -25,7 +25,7 @@ public class OpCommand {

leaves-server/minecraft-patches/features/0076-Wool-Hopper-Counter.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Wool Hopper Counter
 This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet)
 
 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index d152ad88e8e873a0164b2394516bd10f23c7b263..f1388ad51b7549e881cae36a5a9bcd4229442f3e 100644
+index 6dfdd4853d084f63285a7de3db49a245004c4fa5..3145b6ee853f720c5c201f5dd464645eb039100c 100644
 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -205,8 +205,30 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen

leaves-server/minecraft-patches/features/0082-Armor-stand-cant-kill-by-mob-projectile.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Fri, 29 Sep 2023 10:39:36 +0800
-Subject: [PATCH] Armor stand cant kill by mob projectile
-
-
-diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
-index d7725b5ca689e3d5b512baab04e113be77c0b2ee..39b056d73bbdd06ba5cdb5368efcbcc128dc79ae 100644
---- a/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -372,6 +372,15 @@ public class ArmorStand extends LivingEntity {
-             // CraftBukkit end
-             boolean isCanBreakArmorStand = damageSource.is(DamageTypeTags.CAN_BREAK_ARMOR_STAND);
-             boolean isAlwaysKillsArmorStands = damageSource.is(DamageTypeTags.ALWAYS_KILLS_ARMOR_STANDS);
-+
-+            // Leaves start - Armor stand cant kill by mob projectile
-+            if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.armorStandCantKillByMobProjectile) {
-+                if (damageSource.getDirectEntity() instanceof net.minecraft.world.entity.projectile.Projectile projectile && !(projectile.getOwner() instanceof Player)) {
-+                    return false;
-+                }
-+            }
-+            // Leaves end - Armor stand cant kill by mob projectile
-+
-             if (!isCanBreakArmorStand && !isAlwaysKillsArmorStands) {
-                 return false;
-             } else if (damageSource.getEntity() instanceof Player player && !player.getAbilities().mayBuild) {

leaves-server/minecraft-patches/features/0085-More-Region-Format-Support.patch

@@ -54,7 +54,7 @@ index 51c126735ace8fdde89ad97b5cab62f244212db0..a6573e327ace16b7ea320eb1440ffcbc
 +    public void moonrise$write(final org.leavesmc.leaves.region.IRegionFile regionFile) throws IOException; // Leaves - more region format
  }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 25087f470db918dbca3ec582581d02822e5ff17d..7813085bec9f4b3a88ed2394ddc781ad7cf72439 100644
+index 1241b008d66bacd8640302a6dbf52a2e592b29b9..0172b4f0c3d5753a3a3d8ccfe591c09328216e48 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -944,10 +944,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

leaves-server/minecraft-patches/features/0096-Allow-grindstone-overstacking.patch

@@ -147,7 +147,7 @@ index 63d6a43dab067aa4c8fb67095c455130196eef9f..561acadcf81dc219d88e8ec8bdbd4f5f
          this.setChanged();
      }
 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index f6df4c049ed3460eb437a4637c122a5880f2bdbc..d8eede6272ee712c81ed9429539837fdbd27bfcd 100644
+index 4dca615d263f1b0dacf574cfaa00ea23abee2714..d9969741bb8efbf83df51692ebcd12e3d77c10f6 100644
 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -113,6 +113,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen

leaves-server/minecraft-patches/features/0100-Can-disable-LivingEntity-aiStep-alive-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Can disable LivingEntity aiStep alive check
 
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 67e63375db357a95e3854c8e77e0de15d925dfea..2cc5c081a75997be637fe753ccdd222e862170c0 100644
+index 1bf4cda041189aa5ac67be4a1bda312620788388..59a352427b8d6445f3da3c6033bae4826277ed60 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -3285,7 +3285,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin

leaves-server/minecraft-patches/features/0102-Old-Block-remove-behaviour.patch

@@ -594,7 +594,7 @@ index 757f8453e147875ab9f14d9726bb734ef27447c9..d0558d0e33f3d6e25af2dd71650d723e
      protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
          if (state.getValue(SHRIEKING)) {
 diff --git a/net/minecraft/world/level/block/ShulkerBoxBlock.java b/net/minecraft/world/level/block/ShulkerBoxBlock.java
-index c34318fdc454ea31655c3c3aa5dbedd3d922ee24..8a5f70778b550cd470b7225e74c6c87a6ec6e7e5 100644
+index 45e48e6d225a2741cd615345711072610d728474..80520260ccb52935f3c1564c2f161bb148ba7baa 100644
 --- a/net/minecraft/world/level/block/ShulkerBoxBlock.java
 +++ b/net/minecraft/world/level/block/ShulkerBoxBlock.java
 @@ -152,6 +152,19 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
@@ -762,7 +762,7 @@ index be66f0f1cb1b0bcec8f9489a1fdd8777df1adb6b..67719dce9017a4c86a70b62fb660bddc
              this.getBlock().affectNeighborsAfterRemoval(this.asState(), level, pos, movedByPiston);
          }
 diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index 2cdca2917ce6a4912b57594697bf5543801eb868..d0d78d35c87973629dcd83b22ac0435a7498fe00 100644
+index 0e22116fefcbdbf2049b7ec285b35fd03c723dc5..45386818312fbd99bbcb72d14ad9e54cd864a2a8 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -396,20 +396,26 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p

leaves-server/minecraft-patches/features/0103-Old-raid-behavior.patch

@@ -164,7 +164,7 @@ index b3a29ce523fb5de71589c7c17598bba17622f988..8f90f3234c9b80b7a194d5dbffd8ea93
 +    // Leaves end - old FindSpawnPosition
  }
 diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index 7b697f1dfe8131296ef55cd88a8b9d7cd884eb44..0e9cfb43d6620790f04b8a85e75308a306ec4ea5 100644
+index a495789b2d21fa9a24d5dca4ecfa196ddce49466..86e8ca07a1163094b14c55fe8913c7312eeff124 100644
 --- a/net/minecraft/world/entity/raid/Raider.java
 +++ b/net/minecraft/world/entity/raid/Raider.java
 @@ -128,6 +128,43 @@ public abstract class Raider extends PatrollingMonster {

leaves-server/minecraft-patches/features/0109-Skip-negligible-planar-movement-multiplication.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip negligible planar movement multiplication
 This patch is Powered by Gale(https://github.com/Dreeam-qwq/Gale)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 87767c14cf6bed351a7ef9fe578be34a3643fea2..a556618dd51927a15c309bc3a2367c9a05a8e3af 100644
+index 9309ef573407cbdf6bb1859021939798bbcf4669..d7eea7b8b5836b4aba510cfbbdb3788cf21c2abc 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1234,8 +1234,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

leaves-server/minecraft-patches/features/0111-Vanilla-player-display-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Vanilla player display name
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index e9e98636f4e8665fb83d726a701e5d99ba3b992d..b10ae364db96856007ca2fdd37124c77a1f3df14 100644
+index e355939e153c05f9434482c4713743755b280d69..76af3083d6f4c308802be7b8625d905105c3355c 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -476,7 +476,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc

leaves-server/minecraft-patches/features/0112-Fix-SculkCatalyst-exp-skip.patch

@@ -34,7 +34,7 @@ index 76af3083d6f4c308802be7b8625d905105c3355c..531b38be36cb2990cf5fbefbd58f917a
          AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0);
          this.level()
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 2cc5c081a75997be637fe753ccdd222e862170c0..e3673ababa41a4d65b87adbc6d79d53a196564b7 100644
+index 59a352427b8d6445f3da3c6033bae4826277ed60..6b776ff621275e842c113000bd69528c96a598c3 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -277,6 +277,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin

leaves-server/minecraft-patches/features/0114-Vanilla-portal-handle.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Vanilla portal handle
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index a556618dd51927a15c309bc3a2367c9a05a8e3af..fadce8b3073dc67534a4830b40fc2e84fdbd687b 100644
+index d7eea7b8b5836b4aba510cfbbdb3788cf21c2abc..c011fd65f5814c88cb3f6a4f62283efb9b6188ec 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -836,6 +836,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

leaves-server/minecraft-patches/features/0117-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Do not prevent block entity and entity crash at LevelChunk
 
 
 diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index d0d78d35c87973629dcd83b22ac0435a7498fe00..56e7df059cd070a8f472d6712dfb08d14ffa8819 100644
+index 45386818312fbd99bbcb72d14ad9e54cd864a2a8..b27cbb55fcb980679819a605112533f366abc97e 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -952,12 +952,14 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p

leaves-server/minecraft-patches/features/0123-Fast-exp-orb-absorb.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fast exp orb absorb
 
 
 diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java
-index a62edee768c30c99213baa6bd736d67ae52b558c..82fb285f53513cc62f8f7b78b85a91076c73545a 100644
+index cfd9d63f55e73c1777055d13a802b29e151cc0d4..36e691f511c37b8af3f7fc58d9986fefdc3e1e5a 100644
 --- a/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/net/minecraft/world/entity/ExperienceOrb.java
 @@ -358,6 +358,20 @@ public class ExperienceOrb extends Entity {

leaves-server/minecraft-patches/features/0137-Bring-back-LivingEntity-effect-CME.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back LivingEntity effect CME
 
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 6c9a7ae3e9a340de35ca4dfcd486cfe5818d2aa5..782138474b1b2fab525de607f542f621ca92a0e8 100644
+index 0d493c8343057898166f94a4006a374a214ae7b2..951300caeca0421cabda44496ed2f09fc2258dd0 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1151,7 +1151,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin

leaves-server/minecraft-patches/features/0141-Modify-end-void-rings-generation.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 26 Aug 2025 03:14:04 +0800
+Subject: [PATCH] Modify end void rings generation
+
+
+diff --git a/net/minecraft/world/level/levelgen/DensityFunctions.java b/net/minecraft/world/level/levelgen/DensityFunctions.java
+index 04527a5c65ad630f794fed9071d485aedd02257a..0298ba0c68447c5d0d555431b3118552b3d90a34 100644
+--- a/net/minecraft/world/level/levelgen/DensityFunctions.java
++++ b/net/minecraft/world/level/levelgen/DensityFunctions.java
+@@ -528,7 +528,7 @@ public final class DensityFunctions {
+             int i1 = z / 2;
+             int i2 = x % 2;
+             int i3 = z % 2;
+-            float f = 100.0F - Mth.sqrt((long)x * (long)x + (long)z * (long)z) * 8.0F; // Paper - cast ints to long to avoid integer overflow
++            float f = org.leavesmc.leaves.LeavesConfig.fix.vanillaEndVoidRings ? 100.0F - Mth.sqrt(x * x + z * z) * 8.0F : 100.0F - Mth.sqrt((long)x * (long)x + (long)z * (long)z) * 8.0F; // Paper - cast ints to long to avoid integer overflow // Leaves - customize end void rings generation
+             f = Mth.clamp(f, -100.0F, 80.0F);
+ 
+             NoiseCache cache = noiseCache.get().computeIfAbsent(noise, noiseKey -> new NoiseCache()); // Paper - Perf: Optimize end generation

leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java

@@ -304,9 +304,6 @@ public final class LeavesConfig {
             @GlobalConfig("shears-in-dispenser-can-zero-amount")
             public boolean shearsInDispenserCanZeroAmount = false;
 
-            @GlobalConfig("armor-stand-cant-kill-by-mob-projectile")
-            public boolean armorStandCantKillByMobProjectile = false;
-
             @SuppressWarnings("unused")
             @GlobalConfig(value = "villager-infinite-discounts", validator = VillagerInfiniteDiscountsValidator.class)
             private boolean villagerInfiniteDiscounts = false;
@@ -679,9 +676,6 @@ public final class LeavesConfig {
         @GlobalConfig("no-tnt-place-update")
         public boolean noTNTPlaceUpdate = false;
 
-        @GlobalConfig("raider-die-skip-self-raid-check")
-        public boolean skipSelfRaidCheck = false;
-
         @GlobalConfig("container-passthrough")
         public boolean containerPassthrough = false;
 
@@ -1292,5 +1286,8 @@ public final class LeavesConfig {
         public enum CollisionBehavior {
             VANILLA, BLOCK_SHAPE_VANILLA, PAPER
         }
+
+        @GlobalConfig("vanilla-end-void-rings")
+        public boolean vanillaEndVoidRings = false;
     }
 }