Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Grasscutter
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ziqian zhang
Grasscutter
Commits
9d6bc2a9
Commit
9d6bc2a9
authored
3 years ago
by
ImmuState
Committed by
Melledy
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Change active forges in player to list.
parent
8db0500e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/game/managers/ForgingManager/ActiveForgeData.java
+0
-8
0 additions, 8 deletions
...scutter/game/managers/ForgingManager/ActiveForgeData.java
src/main/java/emu/grasscutter/game/player/Player.java
+3
-3
3 additions, 3 deletions
src/main/java/emu/grasscutter/game/player/Player.java
with
3 additions
and
11 deletions
src/main/java/emu/grasscutter/game/managers/ForgingManager/ActiveForgeData.java
+
0
−
8
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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/game/player/Player.java
+
3
−
3
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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment