mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-19 10:24:47 +01:00
Merge branch 'main' into dev-scene
This commit is contained in:
@@ -1,14 +1,18 @@
|
||||
package emu.grasscutter.game.managers;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.commands.PlayerCommands;
|
||||
import emu.grasscutter.commands.CommandMap;
|
||||
import emu.grasscutter.game.GenshinPlayer;
|
||||
import emu.grasscutter.net.packet.GenshinPacket;
|
||||
import emu.grasscutter.server.game.GameServer;
|
||||
import emu.grasscutter.server.packet.send.PacketPlayerChatNotify;
|
||||
import emu.grasscutter.server.packet.send.PacketPrivateChatNotify;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
public class ChatManager {
|
||||
static final List<Character> PREFIXES = Arrays.asList('/', '!');
|
||||
|
||||
private final GameServer server;
|
||||
|
||||
public ChatManager(GameServer server) {
|
||||
@@ -19,15 +23,15 @@ public class ChatManager {
|
||||
return server;
|
||||
}
|
||||
|
||||
public void sendPrivChat(GenshinPlayer player, int targetUid, String message) {
|
||||
public void sendPrivateMessage(GenshinPlayer player, int targetUid, String message) {
|
||||
// Sanity checks
|
||||
if (message == null || message.length() == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if command
|
||||
if (message.charAt(0) == '!' || message.charAt(0) == '/') {
|
||||
PlayerCommands.handle(player, message);
|
||||
if (PREFIXES.contains(message.charAt(0))) {
|
||||
CommandMap.getInstance().invoke(player, message);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -45,7 +49,7 @@ public class ChatManager {
|
||||
target.sendPacket(packet);
|
||||
}
|
||||
|
||||
public void sendPrivChat(GenshinPlayer player, int targetUid, int emote) {
|
||||
public void sendPrivateMessage(GenshinPlayer player, int targetUid, int emote) {
|
||||
// Get target
|
||||
GenshinPlayer target = getServer().getPlayerById(targetUid);
|
||||
|
||||
@@ -60,15 +64,15 @@ public class ChatManager {
|
||||
target.sendPacket(packet);
|
||||
}
|
||||
|
||||
public void sendTeamChat(GenshinPlayer player, int channel, String message) {
|
||||
public void sendTeamMessage(GenshinPlayer player, int channel, String message) {
|
||||
// Sanity checks
|
||||
if (message == null || message.length() == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if command
|
||||
if (message.charAt(0) == '!') {
|
||||
PlayerCommands.handle(player, message);
|
||||
if (PREFIXES.contains(message.charAt(0))) {
|
||||
CommandMap.getInstance().invoke(player, message);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -76,7 +80,7 @@ public class ChatManager {
|
||||
player.getWorld().broadcastPacket(new PacketPlayerChatNotify(player, channel, message));
|
||||
}
|
||||
|
||||
public void sendTeamChat(GenshinPlayer player, int channel, int icon) {
|
||||
public void sendTeamMessage(GenshinPlayer player, int channel, int icon) {
|
||||
// Create and send chat packet
|
||||
player.getWorld().broadcastPacket(new PacketPlayerChatNotify(player, channel, icon));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user