From d89517f58ed14e3c8a0d16ce99b24452b14c2cb1 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Fri, 19 May 2023 19:37:53 -0400 Subject: [PATCH] Add `PlayerEnterDungeonEvent` --- .../grasscutter/game/dungeons/DungeonSystem.java | 9 +++++---- .../event/player/PlayerEnterDungeonEvent.java | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 src/main/java/emu/grasscutter/server/event/player/PlayerEnterDungeonEvent.java diff --git a/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java b/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java index 4ffa17a7e..60ef71347 100644 --- a/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java +++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java @@ -18,10 +18,11 @@ import emu.grasscutter.server.packet.send.PacketDungeonEntryInfoRsp; import emu.grasscutter.utils.Position; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import java.util.List; import lombok.val; import org.reflections.Reflections; +import java.util.List; + public class DungeonSystem extends BaseGameSystem { private static final BasicDungeonSettleListener basicDungeonSettleObserver = new BasicDungeonSettleListener(); @@ -106,13 +107,13 @@ public class DungeonSystem extends BaseGameSystem { return false; } Grasscutter.getLogger() - .info( - "{}({}) is trying to enter dungeon {}", + .debug( + "{} ({}) is trying to enter dungeon {}.", player.getNickname(), player.getUid(), dungeonId); - int sceneId = data.getSceneId(); + var sceneId = data.getSceneId(); var scene = player.getScene(); scene.setPrevScene(sceneId); diff --git a/src/main/java/emu/grasscutter/server/event/player/PlayerEnterDungeonEvent.java b/src/main/java/emu/grasscutter/server/event/player/PlayerEnterDungeonEvent.java new file mode 100644 index 000000000..b976e99b1 --- /dev/null +++ b/src/main/java/emu/grasscutter/server/event/player/PlayerEnterDungeonEvent.java @@ -0,0 +1,16 @@ +package emu.grasscutter.server.event.player; + +import emu.grasscutter.data.excels.dungeon.DungeonData; +import emu.grasscutter.game.player.Player; +import emu.grasscutter.server.event.types.PlayerEvent; +import lombok.Getter; + +public final class PlayerEnterDungeonEvent extends PlayerEvent { + @Getter private final DungeonData dungeon; + + public PlayerEnterDungeonEvent(Player player, DungeonData dungeon) { + super(player); + + this.dungeon = dungeon; + } +}