Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-17 01:12:34 +08:00
Code Issues Projects Releases Wiki Activity

Implement passJumpDungeon. Make dungeons kick you out to the correct scene (#2366)

Browse Source
This commit is contained in:
Nazrin
2023-09-15 17:50:56 -07:00
committed by GitHub
Unverified
parent 2643c6b3b7
commit c4dbb6851b
7 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
+3 -3
View File
@@ -88,7 +88,7 @@ public final class DungeonSystem extends BaseGameSystem {
return handler.execute(condition, params);
}
public boolean enterDungeon(Player player, int pointId, int dungeonId) {
public boolean enterDungeon(Player player, int pointId, int dungeonId, boolean savePrevious) {
DungeonData data = GameData.getDungeonDataMap().get(dungeonId);
if (data == null) {
@@ -103,7 +103,7 @@ public final class DungeonSystem extends BaseGameSystem {
var sceneId = data.getSceneId();
var scene = player.getScene();
scene.setPrevScene(sceneId);
if (savePrevious) scene.setPrevScene(scene.getId());
if (player.getWorld().transferPlayerToScene(player, sceneId, data)) {
scene = player.getScene();
@@ -111,7 +111,7 @@ public final class DungeonSystem extends BaseGameSystem {
scene.addDungeonSettleObserver(basicDungeonSettleObserver);
}
scene.setPrevScenePoint(pointId);
if (savePrevious) scene.setPrevScenePoint(pointId);
return true;
}