Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2026-02-04 15:05:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unstuck players if they login to raid scenes

Browse Source
This commit is contained in:
Melledy
2023-12-23 23:58:15 -08:00
parent 5ed1941795
commit 76dc79630d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/emu/lunarcore/game/player/Player.java
View File

@@ -779,11 +779,17 @@ public class Player implements Tickable {
// Delete instance if it failed to validate (example: missing an excel) // Delete instance if it failed to validate (example: missing an excel)
this.challengeInstance = null; this.challengeInstance = null;
} }
// Unstuck check, dont load player into raid scenes
MazePlaneExcel planeExcel = GameData.getMazePlaneExcelMap().get(planeId);
if (planeExcel == null || planeExcel.getPlaneType().getVal() >= PlaneType.Raid.getVal()) {
this.resetPosition();
}
// Load into saved scene (should happen after everything else loads) // Load into saved scene (should happen after everything else loads)
this.loadScene(planeId, floorId, entryId, this.getPos(), this.getRot(), false); this.loadScene(planeId, floorId, entryId, this.getPos(), this.getRot(), false);
// Unstuck check in case we couldn't load the scene // Reset position to starting scene in case we couldn't load the scene
if (this.getScene() == null) { if (this.getScene() == null) {
this.enterScene(GameConstants.START_ENTRY_ID, 0, false); this.enterScene(GameConstants.START_ENTRY_ID, 0, false);
} }