diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java
index 1124373c1..7f6b26e73 100644
--- a/src/main/java/emu/grasscutter/server/game/GameServer.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -1,58 +1,45 @@
 package emu.grasscutter.server.game;
 
-import static emu.grasscutter.config.Configuration.DISPATCH_INFO;
-import static emu.grasscutter.config.Configuration.GAME_INFO;
-import static emu.grasscutter.utils.lang.Language.translate;
-
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.*;
 import emu.grasscutter.Grasscutter.ServerRunMode;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.battlepass.BattlePassSystem;
-import emu.grasscutter.game.chat.ChatSystem;
-import emu.grasscutter.game.chat.ChatSystemHandler;
+import emu.grasscutter.game.chat.*;
 import emu.grasscutter.game.combine.CombineManger;
-import emu.grasscutter.game.drop.DropSystem;
-import emu.grasscutter.game.drop.DropSystemLegacy;
+import emu.grasscutter.game.drop.*;
 import emu.grasscutter.game.dungeons.DungeonSystem;
 import emu.grasscutter.game.expedition.ExpeditionSystem;
 import emu.grasscutter.game.gacha.GachaSystem;
-import emu.grasscutter.game.managers.cooking.CookingCompoundManager;
-import emu.grasscutter.game.managers.cooking.CookingManager;
+import emu.grasscutter.game.managers.cooking.*;
 import emu.grasscutter.game.managers.energy.EnergyManager;
 import emu.grasscutter.game.managers.stamina.StaminaManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.QuestSystem;
 import emu.grasscutter.game.shop.ShopSystem;
-import emu.grasscutter.game.systems.AnnouncementSystem;
-import emu.grasscutter.game.systems.InventorySystem;
-import emu.grasscutter.game.systems.MultiplayerSystem;
+import emu.grasscutter.game.systems.*;
 import emu.grasscutter.game.talk.TalkSystem;
 import emu.grasscutter.game.tower.TowerSystem;
-import emu.grasscutter.game.world.World;
-import emu.grasscutter.game.world.WorldDataSystem;
+import emu.grasscutter.game.world.*;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
 import emu.grasscutter.server.dispatch.DispatchClient;
 import emu.grasscutter.server.event.game.ServerTickEvent;
-import emu.grasscutter.server.event.internal.ServerStartEvent;
-import emu.grasscutter.server.event.internal.ServerStopEvent;
+import emu.grasscutter.server.event.internal.*;
 import emu.grasscutter.server.event.types.ServerEvent;
 import emu.grasscutter.server.scheduler.ServerTaskScheduler;
 import emu.grasscutter.task.TaskMap;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.time.Instant;
-import java.time.OffsetDateTime;
+import kcp.highway.*;
+import lombok.*;
+import org.jetbrains.annotations.NotNull;
+
+import java.net.*;
+import java.time.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import kcp.highway.ChannelConfig;
-import kcp.highway.KcpServer;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.SneakyThrows;
-import org.jetbrains.annotations.NotNull;
+
+import static emu.grasscutter.config.Configuration.*;
+import static emu.grasscutter.utils.lang.Language.translate;
 
 @Getter
 public final class GameServer extends KcpServer implements Iterable<Player> {
@@ -343,15 +330,11 @@ public final class GameServer extends KcpServer implements Iterable<Player> {
         ServerStopEvent event = new ServerStopEvent(ServerEvent.Type.GAME, OffsetDateTime.now());
         event.call();
 
-        // Kick and save all players
-        List<Player> list = new ArrayList<>(this.getPlayers().size());
-        list.addAll(this.getPlayers().values());
-
-        for (Player player : list) {
+        this.getPlayers().forEach((uid, player) -> {
             player.getSession().close();
-        }
+        });
 
-        getWorlds().forEach(World::save);
+        this.getWorlds().forEach(World::save);
     }
 
     @NotNull @Override