Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 01:15:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tower' into development

Browse Source
This commit is contained in:
Akka
2022-05-07 00:19:51 +08:00
committed by GitHub
parent a7312ce054 17242a24ed
commit c2d2a37fc5
12 changed files with 275 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/emu/grasscutter/game/player/Player.java
View File

@@ -26,6 +26,7 @@ import emu.grasscutter.game.managers.SotSManager.SotSManager;
import emu.grasscutter.game.props.ActionReason;
import emu.grasscutter.game.props.EntityType;
import emu.grasscutter.game.props.PlayerProperty;
import emu.grasscutter.game.props.SceneType;
import emu.grasscutter.game.shop.ShopLimit;
import emu.grasscutter.game.managers.MapMarkManager.*;
import emu.grasscutter.game.tower.TowerManager;
@@ -1041,6 +1042,7 @@ public class Player {
@PostLoad
private void onLoad() {
this.getTeamManager().setPlayer(this);
this.getTowerManager().setPlayer(this);
}
public void save() {
@@ -1110,6 +1112,10 @@ public class Player {
}
public void onLogout() {
// force to leave the dungeon
if(getScene().getSceneType() == SceneType.SCENE_DUNGEON){
this.getServer().getDungeonManager().exitDungeon(this);
}
// Leave world
if (this.getWorld() != null) {
this.getWorld().removePlayer(this);