Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-14 06:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix stuff in rogue instances "not despawning"

Browse Source
This commit is contained in:
Melledy
2023-10-26 04:39:32 -07:00
parent 30d36e8d37
commit 7e15a93af1
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -489,7 +489,7 @@ public class Player {
// Get scene that we want to enter
Scene nextScene = null;
if (getScene() != null && getScene().getPlaneId() == planeId && getScene().getFloorId() == floorId) {
if (getScene() != null && getScene().getPlaneId() == planeId && getScene().getFloorId() == floorId && getScene().getPlaneType() != PlaneType.Rogue) {
// Don't create a new scene if were already in the one we want to teleport to
nextScene = this.scene;
} else {

2
src/main/java/emu/lunarcore/game/rogue/RogueInstance.java
View File

@@ -62,7 +62,7 @@ public class RogueInstance {
return this.getRoomBySiteId(this.getCurrentSiteId());
}
public RogueRoomData enterRoom(int siteId) {
public synchronized RogueRoomData enterRoom(int siteId) {
// Set status on previous room
RogueRoomData prevRoom = getCurrentRoom();
if (prevRoom != null) {

4
src/main/java/emu/lunarcore/game/scene/Scene.java
View File

@@ -94,6 +94,10 @@ public class Scene {
this.loaded = true;
}
public PlaneType getPlaneType() {
return this.getExcel().getPlaneType();
}
private void initSpawns() {
for (GroupInfo group : getFloorInfo().getGroups().values()) {
// Skip non-server groups