Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-02-09 06:18:20 +08:00
Code Issues Projects Releases Wiki Activity

Fix deprecated chat references

Browse Source
This commit is contained in:
AnimeGitB 2022-08-16 14:28:15 +09:30 committed by Luke H-W
parent c115fe1abe
commit 97779fd35a
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -798,7 +798,7 @@ public class Player {
return; return;
} }
this.getServer().getChatManager().sendPrivateMessageFromServer(getUid(), message.toString()); this.getServer().getChatSystem().sendPrivateMessageFromServer(getUid(), message.toString());
// this.sendPacket(new PacketPrivateChatNotify(GameConstants.SERVER_CONSOLE_UID, getUid(), message.toString())); // this.sendPacket(new PacketPrivateChatNotify(GameConstants.SERVER_CONSOLE_UID, getUid(), message.toString()));
} }
@ -810,7 +810,7 @@ public class Player {
*/ */
public void sendMessage(Player sender, Object message) { 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()); this.getServer().getChatSystem().sendPrivateMessage(sender, this.getUid(), message.toString());
} }
// ---------------------MAIL------------------------ // ---------------------MAIL------------------------
@ -1199,7 +1199,7 @@ public class Player {
this.hasSentLoginPackets = true; this.hasSentLoginPackets = true;
// Send server welcome chat. // Send server welcome chat.
this.getServer().getChatManager().sendServerWelcomeMessages(this); this.getServer().getChatSystem().sendServerWelcomeMessages(this);
// Set session state // Set session state
session.setState(SessionState.ACTIVE); session.setState(SessionState.ACTIVE);
@ -1219,7 +1219,7 @@ public class Player {
public void onLogout() { public void onLogout() {
try { try {
// Clear chat history. // Clear chat history.
this.getServer().getChatManager().clearHistoryOnLogout(this); this.getServer().getChatSystem().clearHistoryOnLogout(this);
// stop stamina calculation // stop stamina calculation
getStaminaManager().stopSustainedStaminaHandler(); getStaminaManager().stopSustainedStaminaHandler();

4
src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerChatReq.java
View File

@ -17,9 +17,9 @@ public class HandlerPlayerChatReq extends PacketHandler {
ChatInfo.ContentCase content = req.getChatInfo().getContentCase(); ChatInfo.ContentCase content = req.getChatInfo().getContentCase();
if (content == ChatInfo.ContentCase.TEXT) { if (content == ChatInfo.ContentCase.TEXT) {
session.getServer().getChatManager().sendTeamMessage(session.getPlayer(), req.getChannelId(), req.getChatInfo().getText()); session.getServer().getChatSystem().sendTeamMessage(session.getPlayer(), req.getChannelId(), req.getChatInfo().getText());
} else if (content == ChatInfo.ContentCase.ICON) { } else if (content == ChatInfo.ContentCase.ICON) {
session.getServer().getChatManager().sendTeamMessage(session.getPlayer(), req.getChannelId(), req.getChatInfo().getIcon()); session.getServer().getChatSystem().sendTeamMessage(session.getPlayer(), req.getChannelId(), req.getChatInfo().getIcon());
} }
session.send(new PacketPlayerChatRsp()); session.send(new PacketPlayerChatRsp());

4
src/main/java/emu/grasscutter/server/packet/recv/HandlerPrivateChatReq.java
View File

@ -15,9 +15,9 @@ public class HandlerPrivateChatReq extends PacketHandler {
PrivateChatReq.ContentCase content = req.getContentCase(); PrivateChatReq.ContentCase content = req.getContentCase();
if (content == PrivateChatReq.ContentCase.TEXT) { if (content == PrivateChatReq.ContentCase.TEXT) {
session.getServer().getChatManager().sendPrivateMessage(session.getPlayer(), req.getTargetUid(), req.getText()); session.getServer().getChatSystem().sendPrivateMessage(session.getPlayer(), req.getTargetUid(), req.getText());
} else if (content == PrivateChatReq.ContentCase.ICON) { } else if (content == PrivateChatReq.ContentCase.ICON) {
session.getServer().getChatManager().sendPrivateMessage(session.getPlayer(), req.getTargetUid(), req.getIcon()); session.getServer().getChatSystem().sendPrivateMessage(session.getPlayer(), req.getTargetUid(), req.getIcon());
} }
} }

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerPullPrivateChatReq.java
View File

@ -14,7 +14,7 @@ public class HandlerPullPrivateChatReq extends PacketHandler {
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
PullPrivateChatReq req = PullPrivateChatReq.parseFrom(payload); PullPrivateChatReq req = PullPrivateChatReq.parseFrom(payload);
session.getServer().getChatManager().handlePullPrivateChatReq(session.getPlayer(), req.getTargetUid()); session.getServer().getChatSystem().handlePullPrivateChatReq(session.getPlayer(), req.getTargetUid());
// session.send(new PacketPullPrivateChatRsp(req.getTargetUid())); // session.send(new PacketPullPrivateChatRsp(req.getTargetUid()));
} }

2
src/main/java/emu/grasscutter/server/packet/recv/HandlerPullRecentChatReq.java
View File

@ -10,6 +10,6 @@ import emu.grasscutter.server.packet.send.PacketPullRecentChatRsp;
public class HandlerPullRecentChatReq extends PacketHandler { public class HandlerPullRecentChatReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
session.getServer().getChatManager().handlePullRecentChatReq(session.getPlayer()); session.getServer().getChatSystem().handlePullRecentChatReq(session.getPlayer());
} }
} }