nachonekoawa/Lophine
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issues of photographer with folia region threading

Browse Source
This commit is contained in:
mrhua269
2025-12-06 23:25:37 +08:00
parent 54688d8e34
commit af2af944bf
3 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lophine-server/src/main/java/org/leavesmc/leaves/bot/BotList.java
+1 -1
View File
@@ -281,6 +281,7 @@ 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));
@@ -304,7 +305,6 @@ public class BotList {
this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(removeMessage), false);
}
bot.retireScheduler();
return true;
}
lophine-server/src/main/java/org/leavesmc/leaves/replay/ServerPhotographer.java
+11 -16
View File
@@ -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,18 +159,12 @@ public class ServerPhotographer extends ServerPlayer {
}
public void remove(boolean async, boolean save) {
super.remove(RemovalReason.KILLED);
photographers.remove(this);
LOGGER.info("Photographer {} removed", createState.id);
this.recorder.stop();
Runnable task = () -> {
MinecraftServer.getServer().getPlayerList().removePhotographer(this);
LOGGER.info("Photographer {} removed", createState.id);
};
if (TickThread.isTickThreadFor(this)) {
task.run();
} else {
this.getBukkitEntity().taskScheduler.schedule((nmsentity) -> task.run(), null, 1L);
}
photographers.remove(this);
MinecraftServer.getServer().getPlayerList().removePhotographer(this);
if (!recorder.isSaved()) {
CompletableFuture<Void> future = recorder.saveRecording(saveFile, save);
if (!async) {