From 7ac31d999144d00ff1fff50cefcca21812625d15 Mon Sep 17 00:00:00 2001
From: KingRainbow44 <kobedo11@gmail.com>
Date: Tue, 26 Apr 2022 20:47:28 -0400
Subject: [PATCH] Add dispatch to server hook & create instance

---
 src/main/java/emu/grasscutter/Grasscutter.java     |  4 ++++
 .../emu/grasscutter/plugin/api/ServerHook.java     | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/emu/grasscutter/Grasscutter.java b/src/main/java/emu/grasscutter/Grasscutter.java
index dcd6a3b6f..1cc133580 100644
--- a/src/main/java/emu/grasscutter/Grasscutter.java
+++ b/src/main/java/emu/grasscutter/Grasscutter.java
@@ -9,6 +9,7 @@ import java.net.InetSocketAddress;
 
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.plugin.PluginManager;
+import emu.grasscutter.plugin.api.ServerHook;
 import emu.grasscutter.utils.Utils;
 import org.reflections.Reflections;
 import org.slf4j.LoggerFactory;
@@ -77,6 +78,9 @@ public final class Grasscutter {
 		dispatchServer = new DispatchServer();
 		gameServer = new GameServer(new InetSocketAddress(getConfig().getGameServerOptions().Ip, getConfig().getGameServerOptions().Port));
 		
+		// Create server hook instance.
+		new ServerHook(gameServer, dispatchServer);
+		
 		// Start servers.
 		if(getConfig().RunMode.equalsIgnoreCase("HYBRID")) {
 			dispatchServer.start();
diff --git a/src/main/java/emu/grasscutter/plugin/api/ServerHook.java b/src/main/java/emu/grasscutter/plugin/api/ServerHook.java
index 34ceb25f4..0ba4d7f17 100644
--- a/src/main/java/emu/grasscutter/plugin/api/ServerHook.java
+++ b/src/main/java/emu/grasscutter/plugin/api/ServerHook.java
@@ -1,6 +1,7 @@
 package emu.grasscutter.plugin.api;
 
 import emu.grasscutter.game.GenshinPlayer;
+import emu.grasscutter.server.dispatch.DispatchServer;
 import emu.grasscutter.server.game.GameServer;
 
 import java.util.LinkedList;
@@ -11,7 +12,8 @@ import java.util.List;
  */
 public final class ServerHook {
     private static ServerHook instance;
-    private final GameServer server;
+    private final GameServer gameServer;
+    private final DispatchServer dispatchServer;
 
     /**
      * Gets the server hook instance.
@@ -23,10 +25,12 @@ public final class ServerHook {
 
     /**
      * Hooks into a server.
-     * @param server The server to hook into.
+     * @param gameServer The game server to hook into.
+     * @param dispatchServer The dispatch server to hook into.
      */
-    public ServerHook(GameServer server) {
-        this.server = server;
+    public ServerHook(GameServer gameServer, DispatchServer dispatchServer) {
+        this.gameServer = gameServer;
+        this.dispatchServer = dispatchServer;
         
         instance = this;
     }
@@ -36,6 +40,6 @@ public final class ServerHook {
      * @return Players connected to the server.
      */
     public List<GenshinPlayer> getOnlinePlayers() {
-        return new LinkedList<>(this.server.getPlayers().values());
+        return new LinkedList<>(this.gameServer.getPlayers().values());
     }
 }
\ No newline at end of file