fix: login too slow (#2380)

Grasscutters · Sep 21, 2023 · 5ee4812 · 5ee4812
1 parent ec2bfff
commit 5ee4812
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/main/java/emu/grasscutter/game/home/HomeWorld.java b/src/main/java/emu/grasscutter/game/home/HomeWorld.java
@@ -25,7 +25,6 @@ public HomeWorld(GameServer server, Player owner) {
 
         this.home = owner.isOnline() ? owner.getHome() : GameHome.getByUid(owner.getUid());
         this.refreshModuleManager();
-        server.registerHomeWorld(this);
     }
 
     @Override

diff --git a/src/main/java/emu/grasscutter/game/world/World.java b/src/main/java/emu/grasscutter/game/world/World.java
@@ -72,6 +72,8 @@ public World(GameServer server, Player owner) {
         this.scenes = Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>());
         this.entity = new EntityWorld(this);
         this.lastUpdateTime = System.currentTimeMillis();
+
+        server.registerWorld(this);
     }
 
     public int getLevelEntityId() {

diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -311,11 +311,6 @@ public void deregisterWorld(World world) {
         world.save(); // Save the player's world
     }
 
-    public void registerHomeWorld(HomeWorld homeWorld) {
-        this.getHomeWorlds().put(homeWorld.getOwnerUid(), homeWorld);
-        this.registerWorld(homeWorld);
-    }
-
     public HomeWorld getHomeWorldOrCreate(Player owner) {
         return this.getHomeWorlds()
                 .computeIfAbsent(owner.getUid(), (uid) -> new HomeWorld(this, owner));