Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 08:56:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the chat history not correctly showing.

Browse Source
This commit is contained in:
kyoko
2022-06-12 11:37:44 +08:00
committed by Luke H-W
parent 38107326a1
commit 80f9346983
8 changed files with 189 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/emu/grasscutter/game/player/Player.java
View File

@@ -1052,7 +1052,9 @@ public class Player {
this.messageHandler.append(message.toString());
return;
}
this.sendPacket(new PacketPrivateChatNotify(GameConstants.SERVER_CONSOLE_UID, getUid(), message.toString()));
this.getServer().getChatManager().sendPrivateMessageFromServer(getUid(), message.toString());
// this.sendPacket(new PacketPrivateChatNotify(GameConstants.SERVER_CONSOLE_UID, getUid(), message.toString()));
}
/**
@@ -1062,7 +1064,8 @@ public class Player {
* @param message The message to send.
*/
public void sendMessage(Player sender, Object message) {
this.sendPacket(new PacketPrivateChatNotify(sender.getUid(), this.getUid(), message.toString()));
// this.sendPacket(new PacketPrivateChatNotify(sender.getUid(), this.getUid(), message.toString()));
this.getServer().getChatManager().sendPrivateMessage(sender, this.getUid(), message.toString());
}
// ---------------------MAIL------------------------
@@ -1541,6 +1544,9 @@ public class Player {
// First notify packets sent
this.setHasSentAvatarDataNotify(true);
// Send server welcome chat.
this.getServer().getChatManager().sendServerWelcomeMessages(this);
// Set session state
session.setState(SessionState.ACTIVE);
@@ -1558,6 +1564,9 @@ public class Player {
public void onLogout() {
try{
// Clear chat history.
this.getServer().getChatManager().clearHistoryOnLogout(this);
// stop stamina calculation
getStaminaManager().stopSustainedStaminaHandler();