From 9d6bc2a9104b7c67631d544e66d25e1cf19d7783 Mon Sep 17 00:00:00 2001 From: ImmuState Date: Sat, 4 Jun 2022 11:46:24 -0700 Subject: [PATCH] Change active forges in player to list. --- .../game/managers/ForgingManager/ActiveForgeData.java | 8 -------- src/main/java/emu/grasscutter/game/player/Player.java | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/managers/ForgingManager/ActiveForgeData.java b/src/main/java/emu/grasscutter/game/managers/ForgingManager/ActiveForgeData.java index 9681aa43b..60ef7a167 100644 --- a/src/main/java/emu/grasscutter/game/managers/ForgingManager/ActiveForgeData.java +++ b/src/main/java/emu/grasscutter/game/managers/ForgingManager/ActiveForgeData.java @@ -4,7 +4,6 @@ import dev.morphia.annotations.Entity; @Entity public class ActiveForgeData { - private int queueId; private int forgeId; private int avatarId; @@ -15,13 +14,6 @@ public class ActiveForgeData { // private int nextFinishTimestamp; // private int totalFinishTimestamp; - public int getQueueId() { - return this.queueId; - } - public void setQueueId(int value) { - this.queueId = value; - } - public int getForgeId() { return this.forgeId; } diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java index 99620c1d3..08b4ae274 100644 --- a/src/main/java/emu/grasscutter/game/player/Player.java +++ b/src/main/java/emu/grasscutter/game/player/Player.java @@ -93,7 +93,7 @@ public class Player { private Set flyCloakList; private Set costumeList; private Set unlockedForgingBlueprints; - private Map activeForges; + private List activeForges; private Integer widgetId; @@ -190,7 +190,7 @@ public class Player { this.flyCloakList = new HashSet<>(); this.costumeList = new HashSet<>(); this.unlockedForgingBlueprints = new HashSet<>(); - this.activeForges = new HashMap<>(); + this.activeForges = new ArrayList<>(); this.setSceneId(3); this.setRegionId(1); @@ -529,7 +529,7 @@ public class Player { return this.unlockedForgingBlueprints; } - public Map getActiveForges() { + public List getActiveForges() { return this.activeForges; }