fix: fix some async bugs

We need to check folia-supported,so we update it now

.github/workflows/qodana_code_quality.yml

@@ -0,0 +1,29 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: # Specify your branches here
+      - ver/* # Stable branch
+      - exp/* # Experimental branch
+      - dev/* # Development Branch
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2025.2
+        with:
+          pr-mode: false
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_1658551725 }}
+          QODANA_ENDPOINT: 'https://qodana.cloud'

gradle.properties

@@ -4,7 +4,7 @@ mcVersion=1.21.8
 release=2
 # 0 for skip release, 1 for pre-release, 2 for release
 
-luminolRef=1958fdc8b66b75b23a001490288cc618a76808e3
+luminolRef=46252869190560b69e97c474e91aaa07ac480436
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

lophine-server/minecraft-patches/features/0023-Leaves-Fakeplayer.patch

@@ -20,7 +20,7 @@ index a82d84283632342bd30bc3449983431ba43583e0..f59526f6bfa1b4af5b474f0b438513c9
          Set<CriterionTrigger.Listener<T>> set = (Set) advancements.criterionData.get(this); // Paper - fix PlayerAdvancements leak
          if (set != null && !set.isEmpty()) {
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index 66ec0424a46dcd49cf44467357d80b1a2d84d3b2..04ae8de63af0a8abe578f14c8ef85fd4beca0969 100644
+index 66ec0424a46dcd49cf44467357d80b1a2d84d3b2..58694e28b3ff85ef038fe2ada2672e6d3b074fa4 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
 @@ -96,7 +96,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -28,7 +28,7 @@ index 66ec0424a46dcd49cf44467357d80b1a2d84d3b2..04ae8de63af0a8abe578f14c8ef85fd4
      private volatile PacketListener disconnectListener;
      @Nullable
 -    private volatile PacketListener packetListener;
-+    protected volatile PacketListener packetListener; // Leaves - private -> protected
++    public volatile PacketListener packetListener; // Leaves - private -> protected // Lophine protected -> public
      @Nullable
      private DisconnectionDetails disconnectionDetails;
      private boolean encrypted;
@@ -257,7 +257,7 @@ index 70740381c6501c1a518c52b24381edd16792507f..8ad6d5a2522cfbe316fec2c3b918e2e1
              }
          }
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 89d72f242d0fc224701bdcdf245d948415e7c820..5efe7d94a364cec1bd18c4d8d62c19075d52f3e8 100644
+index 7fb095c544294796768ce19c4409416e2848e296..3393fb585747aaf3fa270c4bfe06ed4e9174d519 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -207,6 +207,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe

lophine-server/minecraft-patches/features/0032-Leaves-Replay-Mod-API.patch

@@ -288,7 +288,7 @@ index f5ba0c9a4c3f9eaa38eeb689de915c25c7165433..24bbc32bc17802edbd9cc14310fe8141
  
              this.setListData(list);
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 5efe7d94a364cec1bd18c4d8d62c19075d52f3e8..a4ee2bcdb31f889c7edbbc422636782c0d5d0af6 100644
+index 3393fb585747aaf3fa270c4bfe06ed4e9174d519..c58b88f09e6f08d178fcb17a13dd790c3cb62aae 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -2836,7 +2836,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -323,7 +323,7 @@ index 4b2dba8b30b72fb3acc00957b3e19d6fc178c99e..afd607df83fda3de6f53f55ad305c8f6
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 11c1eb6995ec3aa896815efa59477096c39089d1..54e7ddf0b3949e02d2705ff7626010c947965938 100644
+index 11c1eb6995ec3aa896815efa59477096c39089d1..762728e490a152d159684324e200ab0d2852ac7f 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -130,6 +130,7 @@ public abstract class PlayerList {
@@ -334,7 +334,7 @@ index 11c1eb6995ec3aa896815efa59477096c39089d1..54e7ddf0b3949e02d2705ff7626010c9
  
      // CraftBukkit start
      private org.bukkit.craftbukkit.CraftServer cserver;
-@@ -213,6 +214,122 @@ public abstract class PlayerList {
+@@ -213,6 +214,123 @@ public abstract class PlayerList {
  
      abstract public void loadAndSaveFiles(); // Paper - fix converting txt to json file; moved from DedicatedPlayerList constructor
  
@@ -384,6 +384,7 @@ index 11c1eb6995ec3aa896815efa59477096c39089d1..54e7ddf0b3949e02d2705ff7626010c9
 +        this.playersByUUID.put(player.getUUID(), player);
 +
 +        player.supressTrackerForLogin = true;
++        worldserver1.getCurrentWorldData().connections.add(player.connection.connection);
 +        worldserver1.addNewPlayer(player);
 +        this.server.getCustomBossEvents().onPlayerConnect(player);
 +        org.bukkit.craftbukkit.entity.CraftPlayer bukkitPlayer = player.getBukkitEntity();
@@ -457,7 +458,7 @@ index 11c1eb6995ec3aa896815efa59477096c39089d1..54e7ddf0b3949e02d2705ff7626010c9
      public void loadSpawnForNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie, org.apache.commons.lang3.mutable.MutableObject<net.minecraft.util.ProblemReporter.ScopedCollector> scopedCollectorStore, org.apache.commons.lang3.mutable.MutableObject<ValueInput> data, org.apache.commons.lang3.mutable.MutableObject<String> lastKnownName, ca.spottedleaf.concurrentutil.completable.CallbackCompletable<org.bukkit.Location> toComplete) { // Folia - region threading - rewrite login process
          player.isRealPlayer = true; // Paper
          player.loginTime = System.currentTimeMillis(); // Paper - Replace OfflinePlayer#getLastPlayed
-@@ -398,6 +515,7 @@ public abstract class PlayerList {
+@@ -398,6 +516,7 @@ public abstract class PlayerList {
  
              // player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // CraftBukkit - replaced with loop below
              this.players.add(player);
@@ -465,7 +466,7 @@ index 11c1eb6995ec3aa896815efa59477096c39089d1..54e7ddf0b3949e02d2705ff7626010c9
              this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
              this.playersByUUID.put(player.getUUID(), player);
              // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player))); // CraftBukkit - replaced with loop below
-@@ -601,6 +719,7 @@ public abstract class PlayerList {
+@@ -601,6 +720,7 @@ public abstract class PlayerList {
      }
  
      protected void save(ServerPlayer player) {
@@ -473,7 +474,7 @@ index 11c1eb6995ec3aa896815efa59477096c39089d1..54e7ddf0b3949e02d2705ff7626010c9
          if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
          player.lastSave = System.nanoTime(); // Folia - region threading - changed to nanoTime tracking
          this.playerIo.save(player);
-@@ -615,6 +734,43 @@ public abstract class PlayerList {
+@@ -615,6 +735,44 @@ public abstract class PlayerList {
          }
      }
  
@@ -497,6 +498,7 @@ index 11c1eb6995ec3aa896815efa59477096c39089d1..54e7ddf0b3949e02d2705ff7626010c9
 +            }
 +        }
 +
++        worldserver.getCurrentWorldData().connections.remove(entityplayer.connection.connection);
 +        worldserver.removePlayerImmediately(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
 +        entityplayer.retireScheduler();
 +        entityplayer.getAdvancements().stopListening();
@@ -517,7 +519,7 @@ index 11c1eb6995ec3aa896815efa59477096c39089d1..54e7ddf0b3949e02d2705ff7626010c9
      public @Nullable net.kyori.adventure.text.Component remove(ServerPlayer player) { // CraftBukkit - return string // Paper - return Component
          // Paper start - Fix kick event leave message not being sent
          return this.remove(player, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? player.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(player.getDisplayName())));
-@@ -688,6 +844,7 @@ public abstract class PlayerList {
+@@ -688,6 +846,7 @@ public abstract class PlayerList {
          player.retireScheduler(); // Paper - Folia schedulers
          player.getAdvancements().stopListening();
          this.players.remove(player);
@@ -525,7 +527,7 @@ index 11c1eb6995ec3aa896815efa59477096c39089d1..54e7ddf0b3949e02d2705ff7626010c9
          this.playersByName.remove(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
          this.server.getCustomBossEvents().onPlayerDisconnect(player);
          UUID uuid = player.getUUID();
-@@ -1044,15 +1201,15 @@ public abstract class PlayerList {
+@@ -1044,15 +1203,15 @@ public abstract class PlayerList {
      }
  
      public String[] getPlayerNamesArray() {

lophine-server/src/main/java/fun/bm/lophine/utils/EntitiesCounterUtil.java

@@ -91,6 +91,7 @@ public class EntitiesCounterUtil {
             Object2IntOpenHashMap<MobCategory> map = new Object2IntOpenHashMap<>();
             for (ReferenceList<Entity> data : data0.values()) {
                 for (Entity entity : GlobalEntitiesCounter.enabled ? data.copy() : data) {
+                    if (entity == null || entity.isRemoved() || !entity.isAlive()) continue;
                     // Lophine start - Copy from net/minecraft/world/level/NaturalSpawner
                     MobCategory category = entity.getType().getCategory();
                     if (category != MobCategory.MISC) {
@@ -132,6 +133,7 @@ public class EntitiesCounterUtil {
         // Lophine start - Copy from net/minecraft/world/level/NaturalSpawner
         PotentialCalculator potentialCalculator = new PotentialCalculator();
         for (Entity entity : entities) {
+            if (entity == null || entity.isRemoved() || !entity.isAlive()) continue;
             // Paper start - Only count natural spawns
             if (!entity.level().paperConfig().entities.spawning.countAllMobsForSpawning &&
                     !(entity.spawnReason == CreatureSpawnEvent.SpawnReason.NATURAL ||
@@ -160,25 +162,4 @@ public class EntitiesCounterUtil {
         return new NaturalSpawner.SpawnState(getTotalChunkCount(level), map, potentialCalculator, calculator);
         // Lophine end - Copy from net/minecraft/world/level/NaturalSpawner
     }
-
-    public static class ChunkCounter {
-        private final int chunkCount;
-        private int timeout = 20;
-
-        public void tick() {
-            timeout--;
-        }
-
-        public ChunkCounter(int chunkCount) {
-            this.chunkCount = chunkCount;
-        }
-
-        public boolean timeout() {
-            return timeout <= 0;
-        }
-
-        public int getChunkCount() {
-            return chunkCount;
-        }
-    }
 }

lophine-server/src/main/java/org/leavesmc/leaves/bot/BotList.java

@@ -121,7 +121,7 @@ public class BotList {
         }
 
         ServerBot bot = new ServerBot(this.server, this.server.getLevel(Level.OVERWORLD), new GameProfile(uuid, realName));
-        bot.connection = new ServerBotPacketListenerImpl(this.server, bot);
+        bot.connection = new ServerBotPacketListenerImpl(this.server, bot, new ServerBotPacketListenerImpl.BotConnection());
         Optional<ValueInput> optional;
         try (ProblemReporter.ScopedCollector scopedCollector = new ProblemReporter.ScopedCollector(bot.problemPath(), LOGGER)) {
             optional = playerIO.load(bot, scopedCollector);
@@ -154,7 +154,7 @@ public class BotList {
 
         bot.isRealPlayer = true;
         bot.loginTime = System.currentTimeMillis();
-        bot.connection = new ServerBotPacketListenerImpl(this.server, bot);
+        bot.connection = new ServerBotPacketListenerImpl(this.server, bot, new ServerBotPacketListenerImpl.BotConnection());
         bot.setServerLevel(world);
 
         BotSpawnLocationEvent event = new BotSpawnLocationEvent(bot.getBukkitEntity(), location);
@@ -175,22 +175,24 @@ public class BotList {
 
         bot.supressTrackerForLogin = true;
 
-        if (TickThread.isTickThreadFor(world, net.minecraft.util.Mth.floor(location.getX()) >> 4, net.minecraft.util.Mth.floor(location.getZ()) >> 4)) {
-            summonBot(bot, world);
-        } else {
-            RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
-                    world, net.minecraft.util.Mth.floor(location.getX()) >> 4, net.minecraft.util.Mth.floor(location.getZ()) >> 4,
-                    () -> summonBot(bot, world),
-                    ca.spottedleaf.concurrentutil.util.Priority.HIGHER);
-        }
         optional.ifPresent(nbt -> {
             bot.loadAndSpawnEnderPearls(nbt);
             bot.loadAndSpawnParentVehicle(nbt);
         });
+
+        if (TickThread.isTickThreadFor(world, location.blockX() >> 4, location.blockZ() >> 4)) {
+            summonBot(bot, world);
+        } else {
+            RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
+                    world, location.getBlockX() >> 4, location.blockZ() >> 4,
+                    () -> summonBot(bot, world));
+        }
+
         return bot;
     }
 
     private ServerBot summonBot(ServerBot bot, ServerLevel world) {
+        world.getCurrentWorldData().connections.add(bot.connection.connection);
         world.addNewPlayer(bot);
 
         BotJoinEvent event1 = new BotJoinEvent(bot.getBukkitEntity(), PaperAdventure.asAdventure(Component.translatable("multiplayer.player.joined", bot.getDisplayName())).style(Style.style(NamedTextColor.YELLOW)));
@@ -277,7 +279,10 @@ public class BotList {
             }
         }
 
+        bot.level().getCurrentWorldData().connections.remove(bot.connection.connection);
         bot.level().removePlayerImmediately(bot, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
+        bot.retireScheduler();
+
         this.bots.remove(bot);
         this.botsByName.remove(bot.getScoreboardName().toLowerCase(Locale.ROOT));
 
@@ -299,6 +304,7 @@ public class BotList {
         if (removeMessage != null && !removeMessage.equals(net.kyori.adventure.text.Component.empty())) {
             this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(removeMessage), false);
         }
+
         return true;
     }
 

lophine-server/src/main/java/org/leavesmc/leaves/bot/ServerBotPacketListenerImpl.java

@@ -29,9 +29,12 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ServerBotPacketListenerImpl extends ServerGamePacketListenerImpl {
+    public final Connection fakeConnection;
 
-    public ServerBotPacketListenerImpl(MinecraftServer server, ServerBot bot) {
-        super(server, BotConnection.INSTANCE, bot, CommonListenerCookie.createInitial(bot.gameProfile, false));
+    public ServerBotPacketListenerImpl(MinecraftServer server, ServerBot bot, BotConnection botConnection) {
+        super(server, botConnection, bot, CommonListenerCookie.createInitial(bot.gameProfile, false));
+        this.fakeConnection = botConnection;
+        this.fakeConnection.packetListener = this;
     }
 
     @Override
@@ -53,8 +56,6 @@ public class ServerBotPacketListenerImpl extends ServerGamePacketListenerImpl {
 
     public static class BotConnection extends Connection {
 
-        private static final BotConnection INSTANCE = new BotConnection();
-
         public BotConnection() {
             super(PacketFlow.SERVERBOUND);
         }

lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/ServuxHudDataProtocol.java

@@ -61,7 +61,6 @@ public class ServuxHudDataProtocol implements LeavesProtocol {
     private static final Table<DataLogger.Type, ServerPlayer, Tag> DATA = HashBasedTable.create();
 
     public static boolean refreshSpawnMetadata = false;
-    private long lastAcceptTime = 0;
 
     @ProtocolHandler.Init
     private static void initializeLoggers() {
@@ -240,8 +239,6 @@ public class ServuxHudDataProtocol implements LeavesProtocol {
         }
 
         long currentTime = System.currentTimeMillis() / 50;
-        if (currentTime == lastAcceptTime) return;
-        lastAcceptTime = currentTime;
 
         if (currentTime % ServuxProtocolConfig.hudUpdateInterval == 0) {
             MinecraftServer server = MinecraftServer.getServer();

lophine-server/src/main/java/org/leavesmc/leaves/replay/RecordMetaData.java

@@ -26,7 +26,7 @@ public class RecordMetaData {
     public static final int CURRENT_FILE_FORMAT_VERSION = 14;
 
     public boolean singleplayer = false;
-    public String serverName = "Leaves";
+    public String serverName = "Lophine";
     public int duration = 0;
     public long date;
     public String mcversion;
@@ -37,4 +37,22 @@ public class RecordMetaData {
     public int selfId = -1;
 
     public Set<UUID> players = new HashSet<>();
+
+    public RecordMetaData copy() {
+        RecordMetaData ret = new RecordMetaData();
+        synchronized (this) {
+            ret.singleplayer = this.singleplayer;
+            ret.serverName = this.serverName;
+            ret.duration = this.duration;
+            ret.date = this.date;
+            ret.mcversion = this.mcversion;
+            ret.fileFormat = this.fileFormat;
+            ret.fileFormatVersion = this.fileFormatVersion;
+            ret.protocol = this.protocol;
+            ret.generator = this.generator;
+            ret.selfId = this.selfId;
+            ret.players = new HashSet<>(this.players);
+        }
+        return ret;
+    }
 }

lophine-server/src/main/java/org/leavesmc/leaves/replay/Recorder.java

@@ -195,7 +195,9 @@ public class Recorder extends Connection {
             }
             case ClientboundAddEntityPacket packet1 -> {
                 if (packet1.getType() == EntityType.PLAYER) {
-                    metaData.players.add(packet1.getUUID());
+                    synchronized (metaData) {
+                        metaData.players.add(packet1.getUUID());
+                    }
                     saveMetadata();
                 }
             }

lophine-server/src/main/java/org/leavesmc/leaves/replay/RecorderOption.java

@@ -27,7 +27,7 @@ import java.util.List;
 public class RecorderOption {
 
     public int recordDistance = -1;
-    public String serverName = "Leaves";
+    public String serverName = "Lophine";
     public RecordWeather forceWeather = null;
     public int forceDayTime = -1;
     public boolean ignoreChat = false;

lophine-server/src/main/java/org/leavesmc/leaves/replay/ReplayFile.java

@@ -123,9 +123,10 @@ public class ReplayFile {
         data.fileFormatVersion = RecordMetaData.CURRENT_FILE_FORMAT_VERSION;
         data.protocol = SharedConstants.getCurrentVersion().protocolVersion();
         data.generator = ProtocolUtils.buildProtocolVersion("replay");
+        RecordMetaData dataCopy = data.copy();
 
         try (Writer writer = new OutputStreamWriter(new FileOutputStream(metaFile), StandardCharsets.UTF_8)) {
-            writer.write(META_GSON.toJson(data));
+            writer.write(META_GSON.toJson(dataCopy));
         }
     }
 

lophine-server/src/main/java/org/leavesmc/leaves/replay/ServerPhotographer.java

@@ -84,9 +84,8 @@ public class ServerPhotographer extends ServerPlayer {
             placePhotographer(server, photographer, world, state);
         } else {
             RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
-                    world, net.minecraft.util.Mth.floor(state.loc.getX()) >> 4, net.minecraft.util.Mth.floor(state.loc.getZ()) >> 4,
-                    () -> placePhotographer(server, photographer, world, state),
-                    ca.spottedleaf.concurrentutil.util.Priority.HIGHER);
+                    world, state.loc.blockX() >> 4, state.loc.blockZ() >> 4,
+                    () -> placePhotographer(server, photographer, world, state));
         }
 
         photographers.add(photographer);
@@ -116,11 +115,13 @@ public class ServerPhotographer extends ServerPlayer {
 
         if (this.followPlayer != null) {
             if (this.getCamera() == this || this.getCamera().level() != this.level()) {
-                this.getBukkitPlayer().teleportAsync(this.getCamera().getBukkitEntity().getLocation());
                 this.setCamera(followPlayer);
             }
+
             if (lastPosVec3.distanceToSqr(this.position()) > 1024D) {
-                this.getBukkitPlayer().teleportAsync(this.getCamera().getBukkitEntity().getLocation());
+                ((CraftPhotographer) this.getBukkitPlayer()).taskScheduler.schedule(ent -> {
+                    this.getBukkitPlayer().teleportAsync(this.getCamera().getBukkitEntity().getLocation());
+                }, null, 1L);
             }
         }
 
@@ -158,13 +159,12 @@ public class ServerPhotographer extends ServerPlayer {
     }
 
     public void remove(boolean async, boolean save) {
-        super.remove(RemovalReason.KILLED);
-        photographers.remove(this);
-        this.recorder.stop();
-        this.getServer().getPlayerList().removePhotographer(this);
-
         LOGGER.info("Photographer {} removed", createState.id);
 
+        this.recorder.stop();
+        photographers.remove(this);
+
+        MinecraftServer.getServer().getPlayerList().removePhotographer(this);
         if (!recorder.isSaved()) {
             CompletableFuture<Void> future = recorder.saveRecording(saveFile, save);
             if (!async) {

qodana.yaml

@@ -0,0 +1,10 @@
+####################################################################################################################
+# WARNING: Do not store sensitive information in this file, as its contents will be included in the Qodana report. #
+####################################################################################################################
+
+version: "1.0"
+linter: jetbrains/qodana-jvm:2025.2
+profile:
+  name: qodana.recommended
+include:
+  - name: CheckDependencyLicenses