[ci skip] Cleanup

leaf-server/minecraft-patches/features/0134-SparklyPaper-Parallel-world-ticking.patch

@@ -1111,79 +1111,30 @@ index 0b4c4707139c9c72929799818ec1a1b25575d70e..acf8059017f4e45c307a113abed36c59
              });
          }
 diff --git a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-index d212f57c8c0b2086f567fd30237b110203d9e8cb..ed4df82581b5411e54068ccc59ea85a78404fa2b 100644
+index d212f57c8c0b2086f567fd30237b110203d9e8cb..3712a2143efe82d41bd62dcec826aede03b6448b 100644
 --- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -126,40 +126,48 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+@@ -126,8 +126,10 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
                  Vec3 vec3 = this.oldPosition();
                  if (owner instanceof ServerPlayer serverPlayer) {
                      if (serverPlayer.connection.isAcceptingMessages()) {
--                        // CraftBukkit start
--                        ServerPlayer serverPlayer1 = serverPlayer.teleport(new TeleportTransition(serverLevel, vec3, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.ROTATION, Relative.DELTA), TeleportTransition.DO_NOTHING, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.ENDER_PEARL));
--                        if (serverPlayer1 == null) {
--                            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT);
--                            return;
--                        }
--                        // CraftBukkit end
--                        if (this.random.nextFloat() < serverLevel.purpurConfig.enderPearlEndermiteChance && serverLevel.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) { // Purpur - Configurable Ender Pearl RNG
--                            Endermite endermite = EntityType.ENDERMITE.create(serverLevel, EntitySpawnReason.TRIGGERED);
--                            if (endermite != null) {
--                                endermite.setPlayerSpawned(true); // Purpur - Add back player spawned endermite API
--                                endermite.moveTo(owner.getX(), owner.getY(), owner.getZ(), owner.getYRot(), owner.getXRot());
--                                serverLevel.addFreshEntity(endermite, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
 +                        // Leaf start - SparklyPaper - parallel world ticking mod (handling for pearl teleportation cross-dimension)
 +                        java.util.function.Consumer<ServerPlayer> teleportPlayerCrossDimensionTask = taskServerPlayer -> {
-+                            // CraftBukkit start
-+                            ServerPlayer serverPlayer1 = taskServerPlayer.teleport(new TeleportTransition(serverLevel, vec3, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.ROTATION, Relative.DELTA), TeleportTransition.DO_NOTHING, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.ENDER_PEARL));
-+                            if (serverPlayer1 == null) {
-+                                this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT);
-+                                return;
-+                            }
-+                            // CraftBukkit end
-+                            if (this.random.nextFloat() < serverLevel.purpurConfig.enderPearlEndermiteChance && serverLevel.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) { // Purpur - Configurable Ender Pearl RNG
-+                                Endermite endermite = EntityType.ENDERMITE.create(serverLevel, EntitySpawnReason.TRIGGERED);
-+                                if (endermite != null) {
-+                                    endermite.setPlayerSpawned(true); // Purpur - Add back player spawned endermite API
-+                                    endermite.moveTo(owner.getX(), owner.getY(), owner.getZ(), owner.getYRot(), owner.getXRot());
-+                                    serverLevel.addFreshEntity(endermite, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
-+                                }
-                             }
--                        }
- 
--                        if (this.isOnPortalCooldown()) {
--                            owner.setPortalCooldown();
--                        }
-+                            if (this.isOnPortalCooldown()) {
-+                                owner.setPortalCooldown();
-+                            }
- 
--                        // CraftBukkit start - moved up
--                        // ServerPlayer serverPlayer1 = serverPlayer.teleport(
--                        //     new TeleportTransition(
--                        //         serverLevel, vec3, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.ROTATION, Relative.DELTA), TeleportTransition.DO_NOTHING
--                        //     )
--                        // );
--                        // CraftBukkit end - moved up
--                        if (serverPlayer1 != null) {
--                            serverPlayer1.resetFallDistance();
--                            serverPlayer1.resetCurrentImpulseContext();
+                         // CraftBukkit start
+-                        ServerPlayer serverPlayer1 = serverPlayer.teleport(new TeleportTransition(serverLevel, vec3, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.ROTATION, Relative.DELTA), TeleportTransition.DO_NOTHING, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.ENDER_PEARL));
++                        ServerPlayer serverPlayer1 = taskServerPlayer.teleport(new TeleportTransition(serverLevel, vec3, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.ROTATION, Relative.DELTA), TeleportTransition.DO_NOTHING, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.ENDER_PEARL));
+                         if (serverPlayer1 == null) {
+                             this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT);
+                             return;
+@@ -156,10 +158,16 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+                         if (serverPlayer1 != null) {
+                             serverPlayer1.resetFallDistance();
+                             serverPlayer1.resetCurrentImpulseContext();
 -                            serverPlayer1.hurtServer(serverPlayer.serverLevel(), this.damageSources().enderPearl().eventEntityDamager(this), this.level().purpurConfig.enderPearlDamage); // CraftBukkit // Paper - fix DamageSource API // Purpur - Configurable Ender Pearl damage
--                        }
-+                            // CraftBukkit start - moved up
-+                            // ServerPlayer serverPlayer1 = serverPlayer.teleport(
-+                            //     new TeleportTransition(
-+                            //         serverLevel, vec3, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.ROTATION, Relative.DELTA), TeleportTransition.DO_NOTHING
-+                            //     )
-+                            // );
-+                            // CraftBukkit end - moved up
-+                            if (serverPlayer1 != null) {
-+                                serverPlayer1.resetFallDistance();
-+                                serverPlayer1.resetCurrentImpulseContext();
-+                                serverPlayer1.hurtServer(taskServerPlayer.serverLevel(), this.damageSources().enderPearl().eventEntityDamager(this), this.level().purpurConfig.enderPearlDamage); // CraftBukkit // Paper - fix DamageSource API // Purpur - Configurable Ender Pearl damage
-+                            }
++                            serverPlayer1.hurtServer(taskServerPlayer.serverLevel(), this.damageSources().enderPearl().eventEntityDamager(this), this.level().purpurConfig.enderPearlDamage); // CraftBukkit // Paper - fix DamageSource API // Purpur - Configurable Ender Pearl damage
+                         }
  
--                        this.playSound(serverLevel, vec3);
-+                            this.playSound(serverLevel, vec3);
+                         this.playSound(serverLevel, vec3);
 +                        };
 +                        if (org.dreeam.leaf.config.modules.async.SparklyPaperParallelWorldTicking.enabled)
 +                            serverPlayer.getBukkitEntity().taskScheduler.schedule(teleportPlayerCrossDimensionTask, entity -> {}, 0);

leaf-server/paper-patches/features/0002-Leaf-Bootstrap.patch

@@ -8,7 +8,7 @@ Removed since Leaf 1.21.4, useless
 org.bukkit.craftbukkit.Main#main -> LeafBootstrap -> PaperBootstrap -> ...
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ecb0fcd1f3b3f3d7751eded3cdf0977c1889c9ed..d0becb56a9911ef4cc55ae8d7c47832f442ad52f 100644
+index bf5343b0847e9f57ffbc7f33714ae6ca62f14332..70d093f71cca569d9da3ae82e738f8f3069f405e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -278,7 +278,8 @@ public class Main {

leaf-server/paper-patches/features/0005-Purpur-Server-Paper-Changes.patch

@@ -761,7 +761,7 @@ index a92e0877669a92851c6d7f83de75ffb087c8e651..daede6da974beb5ff19877caa5e6f8b3
      public Collection<GeneratedStructure> getStructures(int x, int z) {
          return this.getStructures(x, z, struct -> true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index bf5343b0847e9f57ffbc7f33714ae6ca62f14332..2e1b7f613de8876095ef39bb0341a3f9520c8d5d 100644
+index 70d093f71cca569d9da3ae82e738f8f3069f405e..7120ff469b0a0b638a4051b92f00f97da75edae0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -176,6 +176,13 @@ public class Main {

leaf-server/paper-patches/features/0031-SparklyPaper-Parallel-world-ticking.patch

@@ -315,7 +315,7 @@ index af33cab59932f4ec135caf94dc5828930833daf6..caa92e48d031cb54950e6613a82f407d
      }
      // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911c39f80c0 100644
+index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..839cfe99c028c596e15ba63c8a6e4a515b0a5764 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -74,13 +74,98 @@ public class CraftBlock implements Block {
@@ -540,7 +540,7 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
      }
  
      public Block getFace(final BlockFace face) {
-@@ -282,51 +422,37 @@ public class CraftBlock implements Block {
+@@ -282,51 +422,36 @@ public class CraftBlock implements Block {
  
      @Override
      public String toString() {
@@ -577,7 +577,6 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
 +            case SOUTH -> BlockFace.SOUTH;
 +            case WEST -> BlockFace.WEST;
 +            case EAST -> BlockFace.EAST;
-+            default -> BlockFace.SELF;
 +        };
 +        // Leaf end - SparklyPaper - parallel world ticking - formatting
      }
@@ -617,7 +616,7 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
      }
  
      @Override
-@@ -343,18 +469,65 @@ public class CraftBlock implements Block {
+@@ -343,18 +468,65 @@ public class CraftBlock implements Block {
  
      @Override
      public Biome getBiome() {
@@ -685,7 +684,7 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
          this.getWorld().setBiome(this.getX(), this.getY(), this.getZ(), bio);
      }
  
-@@ -370,12 +543,50 @@ public class CraftBlock implements Block {
+@@ -370,12 +542,50 @@ public class CraftBlock implements Block {
  
      @Override
      public boolean isBlockPowered() {
@@ -738,7 +737,7 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
      }
  
      @Override
-@@ -397,46 +608,102 @@ public class CraftBlock implements Block {
+@@ -397,46 +607,101 @@ public class CraftBlock implements Block {
  
      @Override
      public boolean isBlockFacePowered(BlockFace face) {
@@ -829,7 +828,6 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
 +                // Requires Level for hasSignal and getBlockState
 +                if (this.world instanceof net.minecraft.world.level.Level nmsLevel) {
 +                    int power = 0;
-+                    int x = this.getX(); int y = this.getY(); int z = this.getZ();
 +                    BlockPos currentPos = this.position; // Use immutable position
 +
 +                    // Check neighbors using relative positions
@@ -868,7 +866,7 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
  
      @Override
      public int getBlockPower() {
-@@ -479,105 +746,179 @@ public class CraftBlock implements Block {
+@@ -479,105 +744,179 @@ public class CraftBlock implements Block {
  
      @Override
      public PistonMoveReaction getPistonMoveReaction() {
@@ -1089,7 +1087,7 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
      }
  
      @Override
-@@ -592,31 +933,70 @@ public class CraftBlock implements Block {
+@@ -592,31 +931,70 @@ public class CraftBlock implements Block {
  
      @Override
      public Collection<ItemStack> getDrops(ItemStack item, Entity entity) {
@@ -1170,7 +1168,7 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
      @Override
      public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
          this.getCraftWorld().getBlockMetadata().setMetadata(this, metadataKey, newMetadataValue);
-@@ -639,57 +1019,147 @@ public class CraftBlock implements Block {
+@@ -639,57 +1017,147 @@ public class CraftBlock implements Block {
  
      @Override
      public boolean isPassable() {
@@ -1342,7 +1340,7 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
      }
  
      @Override
-@@ -700,7 +1170,10 @@ public class CraftBlock implements Block {
+@@ -700,7 +1168,10 @@ public class CraftBlock implements Block {
      // Paper start
      @Override
      public com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup() {
@@ -1354,7 +1352,7 @@ index 811823a1a7e24a19a7e37eb4c08efdfa19e839ed..ac45c5cbe547705e3e341011740cf911
      }
  
      @Override
-@@ -713,26 +1186,76 @@ public class CraftBlock implements Block {
+@@ -713,26 +1184,76 @@ public class CraftBlock implements Block {
          return this.getNMS().getBlock().getDescriptionId();
      }
  

leaf-server/src/main/java/org/dreeam/leaf/LeafBootstrap.java

@@ -4,10 +4,11 @@ import io.papermc.paper.PaperBootstrap;
 import joptsimple.OptionSet;
 
 public class LeafBootstrap {
+
     public static final boolean enableFMA = Boolean.parseBoolean(System.getProperty("Leaf.enableFMA", "false")); // Leaf - FMA feature
 
     public static void boot(final OptionSet options) {
-        runPreBootTasks();
+        //runPreBootTasks();
 
         PaperBootstrap.boot(options);
     }