mirror of
https://github.com/Aust1n46/VentureChat.git
synced 2025-05-23 10:39:05 +00:00
Switched to more efficient online player lookups.
This commit is contained in:
parent
158a6bdefd
commit
868b84aac8
@ -13,7 +13,7 @@ public class VentureChatPlaceholders extends PlaceholderExpansion {
|
|||||||
if(p == null) {
|
if(p == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(p);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(p);
|
||||||
if(mcp == null) {
|
if(mcp == null) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@ public class BungeeToggle extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(mcp.getPlayer().hasPermission("venturechat.bungeetoggle")) {
|
if(mcp.getPlayer().hasPermission("venturechat.bungeetoggle")) {
|
||||||
if(!mcp.getBungeeToggle()) {
|
if(!mcp.getBungeeToggle()) {
|
||||||
mcp.setBungeeToggle(true);
|
mcp.setBungeeToggle(true);
|
||||||
|
@ -29,7 +29,7 @@ public class Channel extends MineverseCommand implements Listener {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(args.length > 0) {
|
if(args.length > 0) {
|
||||||
if(!ChatChannel.isChannel(args[0])) {
|
if(!ChatChannel.isChannel(args[0])) {
|
||||||
mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
|
mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
|
||||||
@ -53,7 +53,7 @@ public class Channel extends MineverseCommand implements Listener {
|
|||||||
if(event.isCancelled())
|
if(event.isCancelled())
|
||||||
return;
|
return;
|
||||||
ChatChannel channel = event.getChannel();
|
ChatChannel channel = event.getChannel();
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer());
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(event.getPlayer());
|
||||||
if(channel.hasPermission()) {
|
if(channel.hasPermission()) {
|
||||||
if(!mcp.getPlayer().hasPermission(channel.getPermission())) {
|
if(!mcp.getPlayer().hasPermission(channel.getPermission())) {
|
||||||
mcp.removeListening(channel.getName());
|
mcp.removeListening(channel.getName());
|
||||||
|
@ -26,7 +26,7 @@ public class Chatinfo extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player; use /ci [name]");
|
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player; use /ci [name]");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
String listen = "";
|
String listen = "";
|
||||||
String mute = "";
|
String mute = "";
|
||||||
String blockedcommands = "";
|
String blockedcommands = "";
|
||||||
|
@ -36,7 +36,7 @@ public class Chwho extends MineverseCommand {
|
|||||||
if(channel != null) {
|
if(channel != null) {
|
||||||
if(channel.hasPermission()) {
|
if(channel.hasPermission()) {
|
||||||
if(!sender.hasPermission(channel.getPermission())) {
|
if(!sender.hasPermission(channel.getPermission())) {
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(((Player) sender));
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(((Player) sender));
|
||||||
mcp.removeListening(channel.getName());
|
mcp.removeListening(channel.getName());
|
||||||
mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION_VIEW.toString());
|
mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION_VIEW.toString());
|
||||||
return;
|
return;
|
||||||
|
@ -22,7 +22,7 @@ public class Commandblock extends MineverseCommand {
|
|||||||
public void execute(CommandSender sender, String command, String[] args) {
|
public void execute(CommandSender sender, String command, String[] args) {
|
||||||
if(sender.hasPermission("venturechat.commandblock")) {
|
if(sender.hasPermission("venturechat.commandblock")) {
|
||||||
if(args.length > 1) {
|
if(args.length > 1) {
|
||||||
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
|
MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]);
|
||||||
if(player == null) {
|
if(player == null) {
|
||||||
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||||
.replace("{args}", args[0]));
|
.replace("{args}", args[0]));
|
||||||
|
@ -23,7 +23,7 @@ public class Commandspy extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(mcp.getPlayer().hasPermission("venturechat.commandspy")) {
|
if(mcp.getPlayer().hasPermission("venturechat.commandspy")) {
|
||||||
if(!mcp.hasCommandSpy()) {
|
if(!mcp.hasCommandSpy()) {
|
||||||
mcp.setCommandSpy(true);
|
mcp.setCommandSpy(true);
|
||||||
|
@ -23,7 +23,7 @@ public class Filter extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(mcp.getPlayer().hasPermission("venturechat.ignorefilter")) {
|
if(mcp.getPlayer().hasPermission("venturechat.ignorefilter")) {
|
||||||
if(!mcp.hasFilter()) {
|
if(!mcp.hasFilter()) {
|
||||||
mcp.setFilter(true);
|
mcp.setFilter(true);
|
||||||
|
@ -22,8 +22,8 @@ public class Force extends MineverseCommand {
|
|||||||
.replace("{args}", "[player] [message]"));
|
.replace("{args}", "[player] [message]"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
|
MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]);
|
||||||
if(player == null || !player.isOnline()) {
|
if(player == null) {
|
||||||
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||||
.replace("{args}", args[0]));
|
.replace("{args}", args[0]));
|
||||||
return;
|
return;
|
||||||
|
@ -24,7 +24,7 @@ public class Leave extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(args.length > 0) {
|
if(args.length > 0) {
|
||||||
ChatChannel channel = ChatChannel.getChannel(args[0]);
|
ChatChannel channel = ChatChannel.getChannel(args[0]);
|
||||||
if(channel == null) {
|
if(channel == null) {
|
||||||
|
@ -23,7 +23,7 @@ public class Listen extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(args.length > 0) {
|
if(args.length > 0) {
|
||||||
ChatChannel channel = ChatChannel.getChannel(args[0]);
|
ChatChannel channel = ChatChannel.getChannel(args[0]);
|
||||||
if(channel == null) {
|
if(channel == null) {
|
||||||
|
@ -24,7 +24,7 @@ public class Me extends MineverseCommand {
|
|||||||
for(int x = 0; x < args.length; x++)
|
for(int x = 0; x < args.length; x++)
|
||||||
if(args[x].length() > 0)
|
if(args[x].length() > 0)
|
||||||
msg += " " + args[x];
|
msg += " " + args[x];
|
||||||
if(sender instanceof Player && MineverseChatAPI.getMineverseChatPlayer((Player) sender).hasFilter()) {
|
if(sender instanceof Player && MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender).hasFilter()) {
|
||||||
msg = Format.FilterChat(msg);
|
msg = Format.FilterChat(msg);
|
||||||
}
|
}
|
||||||
if(sender.hasPermission("venturechat.color.legacy")) {
|
if(sender.hasPermission("venturechat.color.legacy")) {
|
||||||
|
@ -28,7 +28,7 @@ public class Nick extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
|
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(args[0].equalsIgnoreCase("Off")) {
|
if(args[0].equalsIgnoreCase("Off")) {
|
||||||
mcp.getPlayer().setDisplayName(mcp.getName());
|
mcp.getPlayer().setDisplayName(mcp.getName());
|
||||||
mcp.setNickname(mcp.getName());
|
mcp.setNickname(mcp.getName());
|
||||||
|
@ -23,7 +23,7 @@ public class Party extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
|
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(!mcp.getPlayer().hasPermission("venturechat.party")) {
|
if(!mcp.getPlayer().hasPermission("venturechat.party")) {
|
||||||
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
|
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
|
||||||
return;
|
return;
|
||||||
|
@ -23,7 +23,7 @@ public class RangedSpy extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(mcp.getPlayer().hasPermission("venturechat.rangedspy")) {
|
if(mcp.getPlayer().hasPermission("venturechat.rangedspy")) {
|
||||||
if(!mcp.getRangedSpy()) {
|
if(!mcp.getRangedSpy()) {
|
||||||
mcp.setRangedSpy(true);
|
mcp.setRangedSpy(true);
|
||||||
|
@ -42,7 +42,7 @@ public class VentureChatGui extends MineverseCommand {
|
|||||||
.replace("{args}", "[player] [channel] [hashcode]"));
|
.replace("{args}", "[player] [channel] [hashcode]"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(mcp.getPlayer().hasPermission("venturechat.gui")) {
|
if(mcp.getPlayer().hasPermission("venturechat.gui")) {
|
||||||
MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(args[0]);
|
MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(args[0]);
|
||||||
if(target == null && !args[0].equals("Discord")) {
|
if(target == null && !args[0].equals("Discord")) {
|
||||||
|
@ -25,7 +25,7 @@ public class IgnoreCommandExecutor implements TabExecutor {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(args.length == 0) {
|
if(args.length == 0) {
|
||||||
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS_IGNORE.toString());
|
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS_IGNORE.toString());
|
||||||
return true;
|
return true;
|
||||||
@ -67,8 +67,8 @@ public class IgnoreCommandExecutor implements TabExecutor {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
|
MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]);
|
||||||
if(player == null || !player.isOnline()) {
|
if(player == null) {
|
||||||
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||||
.replace("{args}", args[0]));
|
.replace("{args}", args[0]));
|
||||||
return true;
|
return true;
|
||||||
|
@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream;
|
|||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
@ -29,7 +28,7 @@ public class MessageCommandExecutor implements TabExecutor {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(args.length == 0) {
|
if(args.length == 0) {
|
||||||
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
|
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
|
||||||
.replace("{command}", "/" + command.getName())
|
.replace("{command}", "/" + command.getName())
|
||||||
@ -42,14 +41,8 @@ public class MessageCommandExecutor implements TabExecutor {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
|
MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]);
|
||||||
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
|
if(player == null) {
|
||||||
if(ChatColor.stripColor(p.getNickname()).equals(args[0])) {
|
|
||||||
player = p;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(player == null || !player.isOnline()) {
|
|
||||||
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
|
||||||
.replace("{args}", args[0]));
|
.replace("{args}", args[0]));
|
||||||
return true;
|
return true;
|
||||||
|
@ -23,7 +23,7 @@ public class MessageToggle extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(mcp.getPlayer().hasPermission("venturechat.messagetoggle")) {
|
if(mcp.getPlayer().hasPermission("venturechat.messagetoggle")) {
|
||||||
if(!mcp.getMessageToggle()) {
|
if(!mcp.getMessageToggle()) {
|
||||||
mcp.setMessageToggle(true);
|
mcp.setMessageToggle(true);
|
||||||
|
@ -24,7 +24,7 @@ public class Notifications extends MineverseCommand {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(!mcp.hasNotifications()) {
|
if(!mcp.hasNotifications()) {
|
||||||
mcp.setNotifications(true);
|
mcp.setNotifications(true);
|
||||||
mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_ON.toString());
|
mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_ON.toString());
|
||||||
|
@ -29,17 +29,16 @@ public class Reply extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(args.length > 0) {
|
if(args.length > 0) {
|
||||||
if(mcp.hasReplyPlayer()) {
|
if(mcp.hasReplyPlayer()) {
|
||||||
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(mcp.getReplyPlayer());
|
|
||||||
|
|
||||||
if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
|
if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
|
||||||
sendBungeeCordReply(mcp, player, args);
|
sendBungeeCordReply(mcp, args);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(player == null || !player.isOnline()) {
|
MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(mcp.getReplyPlayer());
|
||||||
|
if(player == null) {
|
||||||
mcp.getPlayer().sendMessage(LocalizedMessage.NO_PLAYER_TO_REPLY_TO.toString());
|
mcp.getPlayer().sendMessage(LocalizedMessage.NO_PLAYER_TO_REPLY_TO.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -117,7 +116,7 @@ public class Reply extends MineverseCommand {
|
|||||||
.replace("{args}", "[message]"));
|
.replace("{args}", "[message]"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sendBungeeCordReply(MineverseChatPlayer mcp, MineverseChatPlayer player, String[] args) {
|
private void sendBungeeCordReply(MineverseChatPlayer mcp, String[] args) {
|
||||||
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
|
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
|
||||||
DataOutputStream out = new DataOutputStream(byteOutStream);
|
DataOutputStream out = new DataOutputStream(byteOutStream);
|
||||||
String msg = "";
|
String msg = "";
|
||||||
@ -146,7 +145,7 @@ public class Reply extends MineverseCommand {
|
|||||||
try {
|
try {
|
||||||
out.writeUTF("Message");
|
out.writeUTF("Message");
|
||||||
out.writeUTF("Send");
|
out.writeUTF("Send");
|
||||||
out.writeUTF(player.getName());
|
out.writeUTF(MineverseChatAPI.getMineverseChatPlayer(mcp.getReplyPlayer()).getName());
|
||||||
out.writeUTF(mcp.getUUID().toString());
|
out.writeUTF(mcp.getUUID().toString());
|
||||||
out.writeUTF(mcp.getName());
|
out.writeUTF(mcp.getName());
|
||||||
out.writeUTF(send);
|
out.writeUTF(send);
|
||||||
|
@ -23,7 +23,7 @@ public class Spy extends MineverseCommand {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
if(mcp.getPlayer().hasPermission("venturechat.spy")) {
|
if(mcp.getPlayer().hasPermission("venturechat.spy")) {
|
||||||
if(!mcp.isSpy()) {
|
if(!mcp.isSpy()) {
|
||||||
mcp.setSpy(true);
|
mcp.setSpy(true);
|
||||||
|
@ -217,7 +217,7 @@ public class CommandListener implements CommandExecutor, Listener {
|
|||||||
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
|
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
|
||||||
for(ChatChannel channel : ChatChannel.getChannels()) {
|
for(ChatChannel channel : ChatChannel.getChannels()) {
|
||||||
if(command.getName().toLowerCase().equals(channel.getAlias())) {
|
if(command.getName().toLowerCase().equals(channel.getAlias())) {
|
||||||
if(args.length == 0) {
|
if(args.length == 0) {
|
||||||
|
@ -121,7 +121,7 @@ public class LoginListener implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void playerLeaving(Player player) {
|
private void playerLeaving(Player player) {
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(player);
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(player);
|
||||||
ConfigurationSection cs = playerData.getConfigurationSection("players." + mcp.getUUID().toString());
|
ConfigurationSection cs = playerData.getConfigurationSection("players." + mcp.getUUID().toString());
|
||||||
if(mcp.getPlayer() == null) {
|
if(mcp.getPlayer() == null) {
|
||||||
return;
|
return;
|
||||||
|
@ -16,7 +16,7 @@ public class SignListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGH)
|
@EventHandler(priority = EventPriority.HIGH)
|
||||||
public void onSignChange(SignChangeEvent event) {
|
public void onSignChange(SignChangeEvent event) {
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer());
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(event.getPlayer());
|
||||||
for(int a = 0; a < event.getLines().length; a++) {
|
for(int a = 0; a < event.getLines().length; a++) {
|
||||||
String line = event.getLine(a);
|
String line = event.getLine(a);
|
||||||
if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
|
if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user