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

dirty fix for /spy not working

Browse Source
This commit is contained in:
destro174
2021-08-22 10:47:39 +02:00
parent 1d5dd7c764
commit 3fd7bbfece
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
galaxy/src/main/java/com/alttd/chat/commands/Spy.java
+3 -3
View File
@@ -25,9 +25,9 @@ public class Spy implements CommandExecutor {
@Override
public void run() {
UUID uuid = ((Player) sender).getUniqueId();
Utility.flipPermission(uuid, Config.SPYPERMISSION);
//Queries.setGlobalChatState(chatUser.isGcOn(), chatUser.getUuid());
sender.sendMessage(MiniMessage.get().parse("You have turned spy " + (!Utility.hasPermission(uuid, Config.GCPERMISSION) ? "<green>on." : "<red>off."))); // TODO load from config and minimessage
ChatUser user = ChatUserManager.getChatUser(uuid);
user.toggleSpy();
sender.sendMessage(MiniMessage.get().parse("You have turned spy " + (user.isSpy() ? "<green>on." : "<red>off."))); // TODO load from config and minimessage
}
}.runTaskAsynchronously(ChatPlugin.getInstance());
return false;
galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class ChatHandler {
sendPrivateMessage(player, target, "privatemessage", component);
Component spymessage = miniMessage.parse(Config.MESSAGESPY, templates);
for(Player pl : Bukkit.getOnlinePlayers()) {
if(pl.hasPermission(Config.SPYPERMISSION) && !pl.equals(player) && !pl.getName().equalsIgnoreCase(target)) { // todo add a toggle for social spy
if(pl.hasPermission(Config.SPYPERMISSION) && ChatUserManager.getChatUser(pl.getUniqueId()).isSpy() && !pl.equals(player) && !pl.getName().equalsIgnoreCase(target)) { // todo add a toggle for social spy
pl.sendMessage(spymessage);
}
}
galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java
+13 -7
View File
@@ -39,10 +39,13 @@ public class PluginMessage implements PluginMessageListener {
String target = in.readUTF();
Player p = Bukkit.getPlayer(uuid);
if (p != null) {
p.sendMessage(GsonComponentSerializer.gson().deserialize(in.readUTF()));
p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1, 1); // todo load this from config
ChatUser user = ChatUserManager.getChatUser(uuid);
user.setReplyTarget(target);
ChatUser chatUser = ChatUserManager.getChatUser(uuid);
if (!chatUser.getIgnoredPlayers().contains(uuid)) {
p.sendMessage(GsonComponentSerializer.gson().deserialize(in.readUTF()));
p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1, 1); // todo load this from config
ChatUser user = ChatUserManager.getChatUser(uuid);
user.setReplyTarget(target);
}
}
break;
}
@@ -51,9 +54,12 @@ public class PluginMessage implements PluginMessageListener {
String target = in.readUTF();
Player p = Bukkit.getPlayer(uuid);
if (p != null) {
p.sendMessage(GsonComponentSerializer.gson().deserialize(in.readUTF()));
ChatUser user = ChatUserManager.getChatUser(uuid);
user.setReplyTarget(target);
ChatUser chatUser = ChatUserManager.getChatUser(uuid);
if (!chatUser.getIgnoredPlayers().contains(uuid)) {
p.sendMessage(GsonComponentSerializer.gson().deserialize(in.readUTF()));
ChatUser user = ChatUserManager.getChatUser(uuid);
user.setReplyTarget(target);
}
}
break;
}
galaxy/src/main/resources/plugin.yml
+1 -1
View File
@@ -15,7 +15,7 @@ commands:
aliases: togglegc
message:
permission: command.message
aliases: msg
aliases: [msg, tell]
reply:
permission: command.message
aliases: r