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

some tweaks

Browse Source
This commit is contained in:
destro174
2021-07-28 20:42:09 +02:00
parent ec9b474f72
commit 9674503170
9 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
galaxy/src/main/java/com/alttd/chat/commands/Ignore.java
+2 -2
View File
@@ -39,9 +39,9 @@ public class Ignore implements CommandExecutor {
if(!chatUser.getIgnoredPlayers().contains(target)) {
chatUser.addIgnoredPlayers(target);
Queries.ignoreUser(((Player) sender).getUniqueId(), target);
sender.sendMessage("You have turned ignored " + targetName + "."); // TODO load from config and minimessage
sender.sendMessage("You have ignored " + targetName + "."); // TODO load from config and minimessage
} else {
sender.sendMessage("You have already ignored " + targetName + "."); // TODO load from config and minimessage
sender.sendMessage("You have ignored " + targetName + "."); // TODO load from config and minimessage
}
}
}.runTaskAsynchronously(ChatPlugin.getInstance());
galaxy/src/main/java/com/alttd/chat/commands/Unignore.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class Unignore implements CommandExecutor {
ChatUser chatUser = ChatUserManager.getChatUser(((Player) sender).getUniqueId());
if(chatUser.getIgnoredPlayers().contains(target)) {
chatUser.removeIgnoredPlayers(target);
Queries.ignoreUser(((Player) sender).getUniqueId(), target);
Queries.unIgnoreUser(((Player) sender).getUniqueId(), target);
sender.sendMessage("You no longer ignore " + targetName + "."); // TODO load from config and minimessage
} else {
sender.sendMessage("You don't have " + targetName + " ignored."); // TODO load from config and minimessage
galaxy/src/main/java/com/alttd/chat/listeners/PluginMessage.java
+22 -4
View File
@@ -7,6 +7,7 @@ import com.alttd.chat.objects.ChatUser;
import com.alttd.chat.util.ALogger;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteStreams;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@@ -23,11 +24,28 @@ public class PluginMessage implements PluginMessageListener {
}
ByteArrayDataInput in = ByteStreams.newDataInput(bytes);
String subChannel = in.readUTF();
UUID uuid;String target; Player p;
switch (subChannel) {
case "privatemessage":
UUID uuid = UUID.fromString(in.readUTF());
String target = in.readUTF();
Player p = Bukkit.getPlayer(uuid);
case "privatemessagesend":
uuid = UUID.fromString(in.readUTF());
target = in.readUTF();
p = Bukkit.getPlayer(uuid);
if(p != null) {
ChatUser user = ChatUserManager.getChatUser(uuid);
user.setReplyTarget(target);
p.sendMessage(GsonComponentSerializer.gson().deserialize(in.readUTF()));
Component spymessage = GsonComponentSerializer.gson().deserialize(in.readUTF());
for(Player pl : Bukkit.getOnlinePlayers()) {
if(pl.hasPermission("chat.social-spy")) { // todo add a toggle for social spy
pl.sendMessage(spymessage);
}
}
}
break;
case "privatemessagesreceived":
uuid = UUID.fromString(in.readUTF());
target = in.readUTF();
p = Bukkit.getPlayer(uuid);
if(p != null) {
ChatUser user = ChatUserManager.getChatUser(uuid);
user.setReplyTarget(target);