Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-13 23:44:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-10-26 02:29:17 +00:00
parent f86259a430
commit 9b4ce34f4a
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
View File

@@ -168,8 +168,7 @@ public final class DungeonSystem extends BaseGameSystem {
dungeonManager.unsetTrialTeam(player);
}
// clean temp team if it has
if (!player.getTeamManager().cleanTemporaryTeam())
{
if (!player.getTeamManager().cleanTemporaryTeam()) {
// no temp team. Will use real current team, but check
// for any dead avatar to prevent switching into them.
player.getTeamManager().checkCurrentAvatarIsAlive(null);

20
src/main/java/emu/grasscutter/game/world/World.java
View File

@@ -325,14 +325,18 @@ public class World implements Iterable<Player> {
}
public void queueTransferPlayerToScene(Player player, int sceneId, Position pos, int delayMs) {
player.setQueuedTeleport(eventExecutor.submit(() -> {
try {
Thread.sleep(delayMs);
transferPlayerToScene(player, sceneId, pos);
} catch (InterruptedException e) {
Grasscutter.getLogger().trace("queueTransferPlayerToScene: teleport to scene {} is interrupted", sceneId);
}
}));
player.setQueuedTeleport(
eventExecutor.submit(
() -> {
try {
Thread.sleep(delayMs);
transferPlayerToScene(player, sceneId, pos);
} catch (InterruptedException e) {
Grasscutter.getLogger()
.trace(
"queueTransferPlayerToScene: teleport to scene {} is interrupted", sceneId);
}
}));
}
public boolean transferPlayerToScene(Player player, int sceneId, Position pos) {