mirror/VentureChat
1
0
Fork 1
mirror of https://github.com/Aust1n46/VentureChat.git synced 2025-05-22 18:09:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switched to more efficient online player lookups.

Browse Source
This commit is contained in:
Aust1n46 2021-02-12 15:11:37 -06:00
parent 158a6bdefd
commit 868b84aac8
25 changed files with 36 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mineverse/Aust1n46/chat/VentureChatPlaceholders.java
View File

@ -13,7 +13,7 @@ public class VentureChatPlaceholders extends PlaceholderExpansion {
if(p == null) {
return null;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(p);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(p);
if(mcp == null) {
return "";
}

2
src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java
View File

@ -23,7 +23,7 @@ public class BungeeToggle extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.bungeetoggle")) {
if(!mcp.getBungeeToggle()) {
mcp.setBungeeToggle(true);

4
src/mineverse/Aust1n46/chat/command/chat/Channel.java
View File

@ -29,7 +29,7 @@ public class Channel extends MineverseCommand implements Listener {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(args.length > 0) {
if(!ChatChannel.isChannel(args[0])) {
mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
@ -53,7 +53,7 @@ public class Channel extends MineverseCommand implements Listener {
if(event.isCancelled())
return;
ChatChannel channel = event.getChannel();
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer());
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(event.getPlayer());
if(channel.hasPermission()) {
if(!mcp.getPlayer().hasPermission(channel.getPermission())) {
mcp.removeListening(channel.getName());

2
src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java
View File

@ -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]");
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
String listen = "";
String mute = "";
String blockedcommands = "";

2
src/mineverse/Aust1n46/chat/command/chat/Chwho.java
View File

@ -36,7 +36,7 @@ public class Chwho extends MineverseCommand {
if(channel != null) {
if(channel.hasPermission()) {
if(!sender.hasPermission(channel.getPermission())) {
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(((Player) sender));
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(((Player) sender));
mcp.removeListening(channel.getName());
mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION_VIEW.toString());
return;

2
src/mineverse/Aust1n46/chat/command/chat/Commandblock.java
View File

@ -22,7 +22,7 @@ public class Commandblock extends MineverseCommand {
public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.commandblock")) {
if(args.length > 1) {
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]);
if(player == null) {
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));

2
src/mineverse/Aust1n46/chat/command/chat/Commandspy.java
View File

@ -23,7 +23,7 @@ public class Commandspy extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.commandspy")) {
if(!mcp.hasCommandSpy()) {
mcp.setCommandSpy(true);

2
src/mineverse/Aust1n46/chat/command/chat/Filter.java
View File

@ -23,7 +23,7 @@ public class Filter extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.ignorefilter")) {
if(!mcp.hasFilter()) {
mcp.setFilter(true);

4
src/mineverse/Aust1n46/chat/command/chat/Force.java
View File

@ -22,8 +22,8 @@ public class Force extends MineverseCommand {
.replace("{args}", "[player] [message]"));
return;
}
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(player == null || !player.isOnline()) {
MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]);
if(player == null) {
sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
return;

2
src/mineverse/Aust1n46/chat/command/chat/Leave.java
View File

@ -24,7 +24,7 @@ public class Leave extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(args.length > 0) {
ChatChannel channel = ChatChannel.getChannel(args[0]);
if(channel == null) {

2
src/mineverse/Aust1n46/chat/command/chat/Listen.java
View File

@ -23,7 +23,7 @@ public class Listen extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(args.length > 0) {
ChatChannel channel = ChatChannel.getChannel(args[0]);
if(channel == null) {

2
src/mineverse/Aust1n46/chat/command/chat/Me.java
View File

@ -24,7 +24,7 @@ public class Me extends MineverseCommand {
for(int x = 0; x < args.length; x++)
if(args[x].length() > 0)
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);
}
if(sender.hasPermission("venturechat.color.legacy")) {

2
src/mineverse/Aust1n46/chat/command/chat/Nick.java
View File

@ -28,7 +28,7 @@ public class Nick extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(args[0].equalsIgnoreCase("Off")) {
mcp.getPlayer().setDisplayName(mcp.getName());
mcp.setNickname(mcp.getName());

2
src/mineverse/Aust1n46/chat/command/chat/Party.java
View File

@ -23,7 +23,7 @@ public class Party extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(!mcp.getPlayer().hasPermission("venturechat.party")) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!");
return;

2
src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java
View File

@ -23,7 +23,7 @@ public class RangedSpy extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.rangedspy")) {
if(!mcp.getRangedSpy()) {
mcp.setRangedSpy(true);

2
src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java
View File

@ -42,7 +42,7 @@ public class VentureChatGui extends MineverseCommand {
.replace("{args}", "[player] [channel] [hashcode]"));
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.gui")) {
MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(target == null && !args[0].equals("Discord")) {

6
src/mineverse/Aust1n46/chat/command/message/IgnoreCommandExecutor.java
View File

@ -25,7 +25,7 @@ public class IgnoreCommandExecutor implements TabExecutor {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return true;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(args.length == 0) {
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS_IGNORE.toString());
return true;
@ -67,8 +67,8 @@ public class IgnoreCommandExecutor implements TabExecutor {
return true;
}
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(player == null || !player.isOnline()) {
MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]);
if(player == null) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
return true;

13
src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java
View File

@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.Sound;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@ -29,7 +28,7 @@ public class MessageCommandExecutor implements TabExecutor {
return true;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(args.length == 0) {
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/" + command.getName())
@ -42,14 +41,8 @@ public class MessageCommandExecutor implements TabExecutor {
return true;
}
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
if(ChatColor.stripColor(p.getNickname()).equals(args[0])) {
player = p;
break;
}
}
if(player == null || !player.isOnline()) {
MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]);
if(player == null) {
mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
return true;

2
src/mineverse/Aust1n46/chat/command/message/MessageToggle.java
View File

@ -23,7 +23,7 @@ public class MessageToggle extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.messagetoggle")) {
if(!mcp.getMessageToggle()) {
mcp.setMessageToggle(true);

2
src/mineverse/Aust1n46/chat/command/message/Notifications.java
View File

@ -24,7 +24,7 @@ public class Notifications extends MineverseCommand {
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(!mcp.hasNotifications()) {
mcp.setNotifications(true);
mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_ON.toString());

13
src/mineverse/Aust1n46/chat/command/message/Reply.java
View File

@ -29,17 +29,16 @@ public class Reply extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(args.length > 0) {
if(mcp.hasReplyPlayer()) {
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(mcp.getReplyPlayer());
if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
sendBungeeCordReply(mcp, player, args);
sendBungeeCordReply(mcp, args);
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());
return;
}
@ -117,7 +116,7 @@ public class Reply extends MineverseCommand {
.replace("{args}", "[message]"));
}
private void sendBungeeCordReply(MineverseChatPlayer mcp, MineverseChatPlayer player, String[] args) {
private void sendBungeeCordReply(MineverseChatPlayer mcp, String[] args) {
ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(byteOutStream);
String msg = "";
@ -146,7 +145,7 @@ public class Reply extends MineverseCommand {
try {
out.writeUTF("Message");
out.writeUTF("Send");
out.writeUTF(player.getName());
out.writeUTF(MineverseChatAPI.getMineverseChatPlayer(mcp.getReplyPlayer()).getName());
out.writeUTF(mcp.getUUID().toString());
out.writeUTF(mcp.getName());
out.writeUTF(send);

2
src/mineverse/Aust1n46/chat/command/message/Spy.java
View File

@ -23,7 +23,7 @@ public class Spy extends MineverseCommand {
plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString());
return;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.spy")) {
if(!mcp.isSpy()) {
mcp.setSpy(true);

2
src/mineverse/Aust1n46/chat/listeners/CommandListener.java
View File

@ -217,7 +217,7 @@ public class CommandListener implements CommandExecutor, Listener {
plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player.");
return true;
}
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender);
for(ChatChannel channel : ChatChannel.getChannels()) {
if(command.getName().toLowerCase().equals(channel.getAlias())) {
if(args.length == 0) {

2
src/mineverse/Aust1n46/chat/listeners/LoginListener.java
View File

@ -121,7 +121,7 @@ public class LoginListener implements Listener {
}
private void playerLeaving(Player player) {
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(player);
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(player);
ConfigurationSection cs = playerData.getConfigurationSection("players." + mcp.getUUID().toString());
if(mcp.getPlayer() == null) {
return;

2
src/mineverse/Aust1n46/chat/listeners/SignListener.java
View File

@ -16,7 +16,7 @@ public class SignListener implements Listener {
@EventHandler(priority = EventPriority.HIGH)
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++) {
String line = event.getLine(a);
if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {