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

Merge remote-tracking branch 'upstream/development' into dev-mail

Browse Source
This commit is contained in:
Benjamin Elsdon
2022-04-26 15:45:58 +08:00
parent 028c7e5604 aa4b65dbf1
commit a2b6633797
16 changed files with 406 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/GenshinPlayer.java
View File

@@ -225,11 +225,11 @@ public class GenshinPlayer {
this.world = world;
}
public GenshinScene getScene() {
public synchronized GenshinScene getScene() {
return scene;
}
public void setScene(GenshinScene scene) {
public synchronized void setScene(GenshinScene scene) {
this.scene = scene;
}