Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2025-02-05 11:28:46 +00:00
Code Issues Projects Releases Wiki Activity

Change active forges in player to list.

Browse Source
This commit is contained in:
ImmuState 2022-06-04 11:46:24 -07:00 committed by Melledy
parent 8db0500e9d
commit 9d6bc2a910
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/emu/grasscutter/game/managers/ForgingManager/ActiveForgeData.java
View File

@ -4,7 +4,6 @@ import dev.morphia.annotations.Entity;
@Entity @Entity
public class ActiveForgeData { public class ActiveForgeData {
private int queueId;
private int forgeId; private int forgeId;
private int avatarId; private int avatarId;
@ -15,13 +14,6 @@ public class ActiveForgeData {
// private int nextFinishTimestamp; // private int nextFinishTimestamp;
// private int totalFinishTimestamp; // private int totalFinishTimestamp;
public int getQueueId() {
return this.queueId;
}
public void setQueueId(int value) {
this.queueId = value;
}
public int getForgeId() { public int getForgeId() {
return this.forgeId; return this.forgeId;
} }

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

@ -93,7 +93,7 @@ public class Player {
private Set<Integer> flyCloakList; private Set<Integer> flyCloakList;
private Set<Integer> costumeList; private Set<Integer> costumeList;
private Set<Integer> unlockedForgingBlueprints; private Set<Integer> unlockedForgingBlueprints;
private Map<Integer, ActiveForgeData> activeForges; private List<ActiveForgeData> activeForges;
private Integer widgetId; private Integer widgetId;
@ -190,7 +190,7 @@ public class Player {
this.flyCloakList = new HashSet<>(); this.flyCloakList = new HashSet<>();
this.costumeList = new HashSet<>(); this.costumeList = new HashSet<>();
this.unlockedForgingBlueprints = new HashSet<>(); this.unlockedForgingBlueprints = new HashSet<>();
this.activeForges = new HashMap<>(); this.activeForges = new ArrayList<>();
this.setSceneId(3); this.setSceneId(3);
this.setRegionId(1); this.setRegionId(1);
@ -529,7 +529,7 @@ public class Player {
return this.unlockedForgingBlueprints; return this.unlockedForgingBlueprints;
} }
public Map<Integer, ActiveForgeData> getActiveForges() { public List<ActiveForgeData> getActiveForges() {
return this.activeForges; return this.activeForges;
} }