Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 20:56:55 +00:00
Code Issues 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
Show Stats 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); dungeonManager.unsetTrialTeam(player);
} }
// clean temp team if it has // clean temp team if it has
if (!player.getTeamManager().cleanTemporaryTeam()) if (!player.getTeamManager().cleanTemporaryTeam()) {
{
// no temp team. Will use real current team, but check // no temp team. Will use real current team, but check
// for any dead avatar to prevent switching into them. // for any dead avatar to prevent switching into them.
player.getTeamManager().checkCurrentAvatarIsAlive(null); player.getTeamManager().checkCurrentAvatarIsAlive(null);

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

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

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonDieOptionReq.java
View File

@ -2,7 +2,6 @@ package emu.grasscutter.server.packet.recv;
import emu.grasscutter.net.packet.*; import emu.grasscutter.net.packet.*;
import emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq; import emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq;
import emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption;
import emu.grasscutter.server.game.GameSession; import emu.grasscutter.server.game.GameSession;
@Opcodes(PacketOpcodes.DungeonDieOptionReq) @Opcodes(PacketOpcodes.DungeonDieOptionReq)
@ -19,4 +18,3 @@ public class HandlerDungeonDieOptionReq extends PacketHandler {
session.getPlayer().sendPacket(new BasePacket(PacketOpcodes.DungeonDieOptionRsp)); session.getPlayer().sendPacket(new BasePacket(PacketOpcodes.DungeonDieOptionRsp));
} }
} }