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

Made sure ppl who ignore ppl don't see their globalchat messages

Browse Source
This commit is contained in:
Teriuihi 2021-07-30 23:23:37 +02:00
parent 5a362ca67d
commit fb594e6825
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import com.alttd.chat.config.Config;
import com.alttd.chat.managers.ChatUserManager; import com.alttd.chat.managers.ChatUserManager;
import com.alttd.chat.objects.ChatUser; import com.alttd.chat.objects.ChatUser;
import com.alttd.chat.util.ALogger; import com.alttd.chat.util.ALogger;
import com.alttd.chat.util.Utility;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
@ -25,20 +26,37 @@ public class PluginMessage implements PluginMessageListener {
ByteArrayDataInput in = ByteStreams.newDataInput(bytes); ByteArrayDataInput in = ByteStreams.newDataInput(bytes);
String subChannel = in.readUTF(); String subChannel = in.readUTF();
switch (subChannel) { switch (subChannel) {
case "privatemessage": case "privatemessage": {
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 p = Bukkit.getPlayer(uuid);
if(p != null) { if (p != null) {
p.sendMessage(GsonComponentSerializer.gson().deserialize(in.readUTF())); p.sendMessage(GsonComponentSerializer.gson().deserialize(in.readUTF()));
ChatUser user = ChatUserManager.getChatUser(uuid); ChatUser user = ChatUserManager.getChatUser(uuid);
user.setReplyTarget(target); user.setReplyTarget(target);
} }
break; break;
case "globalchat": }
if(ChatPlugin.getInstance().serverGlobalChatEnabled()) case "globalchat": {
Bukkit.broadcast(GsonComponentSerializer.gson().deserialize(in.readUTF()), Config.GCPERMISSION); if (ChatPlugin.getInstance().serverGlobalChatEnabled()) {
String uuidString = in.readUTF();
if (uuidString.matches("\\b[0-9a-f]{8}\\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\\b[0-9a-f]{12}\\b")) {
Bukkit.broadcast(GsonComponentSerializer.gson().deserialize(in.readUTF()), Config.GCPERMISSION);
break;
}
UUID uuid = UUID.fromString(uuidString);
String message = in.readUTF();
Bukkit.getOnlinePlayers().forEach(a -> {
ChatUser chatUser = ChatUserManager.getChatUser(a.getUniqueId());
if (a.hasPermission(Config.GCPERMISSION) && chatUser.getIgnoredPlayers().contains(uuid)) {
a.sendMessage(GsonComponentSerializer.gson().deserialize(message));
}
});
}
break; break;
}
default: default:
break; break;
} }