diff --git a/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java b/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java index 27810bf87..ee56a873c 100644 --- a/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java +++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java @@ -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); diff --git a/src/main/java/emu/grasscutter/game/world/World.java b/src/main/java/emu/grasscutter/game/world/World.java index 1e4253745..4fa2cb809 100644 --- a/src/main/java/emu/grasscutter/game/world/World.java +++ b/src/main/java/emu/grasscutter/game/world/World.java @@ -325,14 +325,18 @@ public class World implements Iterable { } 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) { diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonDieOptionReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonDieOptionReq.java index ba57d7e95..49fa74855 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonDieOptionReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonDieOptionReq.java @@ -2,7 +2,6 @@ package emu.grasscutter.server.packet.recv; import emu.grasscutter.net.packet.*; import emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq; -import emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption; import emu.grasscutter.server.game.GameSession; @Opcodes(PacketOpcodes.DungeonDieOptionReq) @@ -19,4 +18,3 @@ public class HandlerDungeonDieOptionReq extends PacketHandler { session.getPlayer().sendPacket(new BasePacket(PacketOpcodes.DungeonDieOptionRsp)); } } -