Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Teriuihi 2025-01-02 00:22:03 +01:00
parent b3e545a0c8
commit c5c60d25b1
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java
View File

@ -22,13 +22,14 @@ import org.bukkit.Sound;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.messaging.PluginMessageListener; import org.bukkit.plugin.messaging.PluginMessageListener;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.NotNull;
import java.util.UUID; import java.util.UUID;
public class PluginMessage implements PluginMessageListener { public class PluginMessage implements PluginMessageListener {
@Override @Override
public void onPluginMessageReceived(String channel, Player player, byte[] bytes) { public void onPluginMessageReceived(String channel, @NotNull Player ignored, byte[] bytes) {
if (!channel.equals(Config.MESSAGECHANNEL)) { if (!channel.equals(Config.MESSAGECHANNEL)) {
return; return;
} }
@ -38,35 +39,36 @@ public class PluginMessage implements PluginMessageListener {
case "privatemessagein": { case "privatemessagein": {
UUID uuid = UUID.fromString(in.readUTF()); UUID uuid = UUID.fromString(in.readUTF());
String target = in.readUTF(); String target = in.readUTF();
Player p = Bukkit.getPlayer(uuid); Player player = Bukkit.getPlayer(uuid);
String message = in.readUTF(); String message = in.readUTF();
UUID targetuuid = UUID.fromString(in.readUTF()); UUID targetuuid = UUID.fromString(in.readUTF());
if (p != null) { if (player == null) {
ChatUser chatUser = ChatUserManager.getChatUser(uuid); break;
if (!chatUser.getIgnoredPlayers().contains(targetuuid)) { }
p.sendMessage(GsonComponentSerializer.gson().deserialize(message)); ChatUser chatUser = ChatUserManager.getChatUser(uuid);
p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1, 1); // todo load this from config if (!chatUser.getIgnoredPlayers().contains(targetuuid)) {
ChatUser user = ChatUserManager.getChatUser(uuid); player.sendMessage(GsonComponentSerializer.gson().deserialize(message));
if (!user.getReplyContinueTarget().equalsIgnoreCase(target)) player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1, 1); // todo load this from config
user.setReplyTarget(target); ChatUser user = ChatUserManager.getChatUser(uuid);
} if (!user.getReplyContinueTarget().equalsIgnoreCase(target))
user.setReplyTarget(target);
} }
break;
} }
case "privatemessageout": { case "privatemessageout": {
UUID uuid = UUID.fromString(in.readUTF()); UUID uuid = UUID.fromString(in.readUTF());
String target = in.readUTF(); String target = in.readUTF();
Player p = Bukkit.getPlayer(uuid); Player player = Bukkit.getPlayer(uuid);
String message = in.readUTF(); String message = in.readUTF();
UUID targetuuid = UUID.fromString(in.readUTF()); UUID targetuuid = UUID.fromString(in.readUTF());
if (p != null) { if (player == null) {
ChatUser chatUser = ChatUserManager.getChatUser(uuid); break;
if (!chatUser.getIgnoredPlayers().contains(targetuuid)) { }
chatUser.setReplyTarget(target); ChatUser chatUser = ChatUserManager.getChatUser(uuid);
p.sendMessage(GsonComponentSerializer.gson().deserialize(message)); if (!chatUser.getIgnoredPlayers().contains(targetuuid)) {
chatUser.setReplyTarget(target);
player.sendMessage(GsonComponentSerializer.gson().deserialize(message));
// ChatUser user = ChatUserManager.getChatUser(uuid); // ChatUser user = ChatUserManager.getChatUser(uuid);
// user.setReplyTarget(target); // user.setReplyTarget(target);
}
} }
break; break;
} }