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
dd8d1752
Commit
dd8d1752
authored
3 years ago
by
Melledy
Browse files
Options
Downloads
Patches
Plain Diff
Deregister empty scenes if a player leaves them
parent
c65443f4
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/GenshinScene.java
+6
-0
6 additions, 0 deletions
src/main/java/emu/grasscutter/game/GenshinScene.java
src/main/java/emu/grasscutter/game/World.java
+9
-1
9 additions, 1 deletion
src/main/java/emu/grasscutter/game/World.java
with
15 additions
and
1 deletion
src/main/java/emu/grasscutter/game/GenshinScene.java
+
6
−
0
View file @
dd8d1752
...
...
@@ -117,6 +117,7 @@ public class GenshinScene {
}
public
void
removePlayer
(
GenshinPlayer
player
)
{
// Remove player from scene
getPlayers
().
remove
(
player
);
player
.
setScene
(
null
);
...
...
@@ -127,6 +128,11 @@ public class GenshinScene {
for
(
EntityGadget
gadget
:
player
.
getTeamManager
().
getGadgets
())
{
this
.
removeEntity
(
gadget
);
}
// Deregister scene if not in use
if
(
this
.
getEntities
().
size
()
<=
0
)
{
this
.
getWorld
().
deregisterScene
(
this
);
}
}
private
void
setupPlayerAvatars
(
GenshinPlayer
player
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/game/World.java
+
9
−
1
View file @
dd8d1752
...
...
@@ -111,7 +111,7 @@ public class World implements Iterable<GenshinPlayer> {
SceneData
sceneData
=
GenshinData
.
getSceneDataMap
().
get
(
sceneId
);
if
(
sceneData
!=
null
)
{
scene
=
new
GenshinScene
(
this
,
sceneData
);
this
.
getScenes
().
put
(
sceneId
,
scene
);
this
.
registerScene
(
scene
);
return
scene
;
}
...
...
@@ -198,6 +198,14 @@ public class World implements Iterable<GenshinPlayer> {
}
}
public
void
registerScene
(
GenshinScene
scene
)
{
this
.
getScenes
().
put
(
scene
.
getId
(),
scene
);
}
public
void
deregisterScene
(
GenshinScene
scene
)
{
this
.
getScenes
().
remove
(
scene
.
getId
());
}
public
boolean
transferPlayerToScene
(
GenshinPlayer
player
,
int
sceneId
,
Position
pos
)
{
if
(
player
.
getScene
().
getId
()
==
sceneId
||
GenshinData
.
getSceneDataMap
().
get
(
sceneId
)
==
null
)
{
return
false
;
...
...
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