From aedfb59831dc7e59f81b91879387f7f63b49cdc1 Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Tue, 19 Apr 2022 04:13:38 -0700
Subject: [PATCH] Remove duplicate function and fix stackoverflow issue

---
 src/main/java/emu/grasscutter/game/GenshinPlayer.java    | 9 ---------
 .../java/emu/grasscutter/server/game/GameServer.java     | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/GenshinPlayer.java b/src/main/java/emu/grasscutter/game/GenshinPlayer.java
index e29a6dcc4..70fea04f0 100644
--- a/src/main/java/emu/grasscutter/game/GenshinPlayer.java
+++ b/src/main/java/emu/grasscutter/game/GenshinPlayer.java
@@ -571,15 +571,6 @@ public class GenshinPlayer {
 	public void sendMessage(GenshinPlayer sender, Object message) {
 		this.sendPacket(new PacketPrivateChatNotify(sender.getUid(), this.getUid(), message.toString()));
 	}
-
-	/**
-	 * Sends a message to another player.
-	 * @param sender The sender of the message.
-	 * @param message The message to send.
-	 */
-	public void sendMessage(GenshinPlayer sender, Object message) {
-		this.sendPacket(new PacketPrivateChatNotify(sender.getId(), this.getId(), message.toString()));
-	}
 	
 	public void interactWith(int gadgetEntityId) {
 		GenshinEntity entity = getScene().getEntityById(gadgetEntityId);
diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java
index d54f57d23..b42ced55c 100644
--- a/src/main/java/emu/grasscutter/server/game/GameServer.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -118,7 +118,7 @@ public final class GameServer extends MihoyoKcpServer {
 		}
 		
 		// Get from online players
-		GenshinPlayer player = this.getPlayerByUid(id);
+		GenshinPlayer player = this.getPlayers().get(id);
 		
 		if (!allowOfflinePlayers) {
 			return player;