Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 04:32:53 +08:00
Code Issues Projects Releases Wiki Activity

Change method of not ticking empty scenes (#2211)

Browse Source
This commit is contained in:
Nazrin 2023-06-16 11:04:16 -07:00 committed by GitHub
parent 248af4abfb
commit 89376d58bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@ -556,10 +556,6 @@ public final class Scene {
this.finishLoading(); this.finishLoading();
this.checkPlayerRespawn(); this.checkPlayerRespawn();
if (this.tickCount++ % 10 == 0) this.broadcastPacket(new PacketSceneTimeNotify(this)); if (this.tickCount++ % 10 == 0) this.broadcastPacket(new PacketSceneTimeNotify(this));
if (this.getPlayerCount() <= 0 && !this.dontDestroyWhenEmpty) {
this.getScriptManager().onDestroy();
this.getWorld().deregisterScene(this);
}
} }
/** Validates a player's current position. Teleports the player if the player is out of bounds. */ /** Validates a player's current position. Teleports the player if the player is out of bounds. */

4
src/main/java/emu/grasscutter/game/world/World.java
View File

@ -437,7 +437,9 @@ public class World implements Iterable<Player> {
// Check if there are players in this world. // Check if there are players in this world.
if (this.getPlayerCount() == 0) return true; if (this.getPlayerCount() == 0) return true;
// Tick all associated scenes. // Tick all associated scenes.
this.getScenes().forEach((k, scene) -> scene.onTick()); this.getScenes().forEach((k, scene) -> {
if (scene.getPlayerCount() > 0) scene.onTick();
});
// sync time every 10 seconds // sync time every 10 seconds
if (this.tickCount % 10 == 0) { if (this.tickCount % 10 == 0) {