Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
9d6bc2a9
Commit
9d6bc2a9
authored
Jun 04, 2022
by
ImmuState
Committed by
Melledy
Jun 08, 2022
Browse files
Change active forges in player to list.
parent
8db0500e
Changes
2
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/managers/ForgingManager/ActiveForgeData.java
View file @
9d6bc2a9
...
@@ -4,7 +4,6 @@ import dev.morphia.annotations.Entity;
...
@@ -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 {
...
@@ -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
;
}
}
...
...
src/main/java/emu/grasscutter/game/player/Player.java
View file @
9d6bc2a9
...
@@ -93,7 +93,7 @@ public class Player {
...
@@ -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 {
...
@@ -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 {
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment