cdanesi/ajQueue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix kick-kicked-players looking for queueserver name instead of server name

Browse Source
This commit is contained in:
ajgeiss0702
2022-01-04 10:38:56 -07:00
parent 14603f5e51
commit cca8c2740f
6 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
+7 -3
View File
@@ -12,7 +12,7 @@ import us.ajg0702.queue.api.queues.QueueServer;
import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.api.server.AdaptedServer;
import us.ajg0702.queue.commands.commands.PlayerSender; import us.ajg0702.queue.commands.commands.PlayerSender;
import us.ajg0702.queue.common.players.QueuePlayerImpl; import us.ajg0702.queue.common.players.QueuePlayerImpl;
import us.ajg0702.queue.common.utils.Debugger; import us.ajg0702.queue.common.utils.Debug;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
@@ -181,7 +181,7 @@ public class EventHandlerImpl implements EventHandler {
String plainReason = PlainTextComponentSerializer.plainText().serialize(reason); String plainReason = PlainTextComponentSerializer.plainText().serialize(reason);
Debugger.debug(player.getName()+" kicked! Moving: "+moving+" from: "+from.getName()+" plainReason: "+plainReason ); Debug.info(player.getName()+" kicked! Moving: "+moving+" from: "+from.getName()+" plainReason: "+plainReason );
if(!moving && main.getConfig().getBoolean("send-fail-debug")) { if(!moving && main.getConfig().getBoolean("send-fail-debug")) {
main.getLogger().warning("Failed to send "+player.getName()+" to "+from.getName()+". Kicked with reason: "+plainReason); main.getLogger().warning("Failed to send "+player.getName()+" to "+from.getName()+". Kicked with reason: "+plainReason);
@@ -219,6 +219,7 @@ public class EventHandlerImpl implements EventHandler {
List<String> kickReasons = main.getConfig().getStringList("kick-reasons"); List<String> kickReasons = main.getConfig().getStringList("kick-reasons");
boolean kickPlayer = main.getConfig().getBoolean("kick-kicked-players"); boolean kickPlayer = main.getConfig().getBoolean("kick-kicked-players");
if(kickPlayer) { if(kickPlayer) {
Debug.info("Initially kicking player");
List<String> svs = main.getConfig().getStringList("queue-servers"); List<String> svs = main.getConfig().getStringList("queue-servers");
boolean found = false; boolean found = false;
for(String s : svs) { for(String s : svs) {
@@ -226,12 +227,15 @@ public class EventHandlerImpl implements EventHandler {
String[] parts = s.split(":"); String[] parts = s.split(":");
String fromName = parts[0]; String fromName = parts[0];
QueueServer toServer = main.getQueueManager().findServer(parts[1]); QueueServer toServer = main.getQueueManager().findServer(parts[1]);
if(fromName.equalsIgnoreCase(server.getName()) && toServer != null && toServer.equals(server)) { if(toServer == null) continue;
Debug.info("fromName equals: "+fromName.equalsIgnoreCase(player.getServerName())+" ("+fromName+" = "+player.getServerName()+") toServer equals: "+toServer.equals(server));
if(fromName.equalsIgnoreCase(player.getServerName()) && toServer.equals(server)) {
found = true; found = true;
} }
} }
kickPlayer = found; kickPlayer = found;
} }
Debug.info("Kick player: "+kickPlayer);
for(String kickReason : kickReasons) { for(String kickReason : kickReasons) {
if(plainReason.toLowerCase().contains(kickReason.toLowerCase())) { if(plainReason.toLowerCase().contains(kickReason.toLowerCase())) {
common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java
+5 -5
View File
@@ -11,7 +11,7 @@ import us.ajg0702.queue.api.queues.QueueServer;
import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.api.server.AdaptedServer;
import us.ajg0702.queue.common.players.QueuePlayerImpl; import us.ajg0702.queue.common.players.QueuePlayerImpl;
import us.ajg0702.queue.common.queues.QueueServerImpl; import us.ajg0702.queue.common.queues.QueueServerImpl;
import us.ajg0702.queue.common.utils.Debugger; import us.ajg0702.queue.common.utils.Debug;
import us.ajg0702.utils.common.Messages; import us.ajg0702.utils.common.Messages;
import us.ajg0702.utils.common.TimeUtils; import us.ajg0702.utils.common.TimeUtils;
@@ -91,15 +91,15 @@ public class QueueManagerImpl implements QueueManager {
@Override @Override
public boolean addToQueue(AdaptedPlayer player, QueueServer server) { public boolean addToQueue(AdaptedPlayer player, QueueServer server) {
if(player == null || server == null) { if(player == null || server == null) {
Debugger.debug("addToQueue method called, but something is null"); Debug.info("addToQueue method called, but something is null");
return false; return false;
} }
if(!player.isConnected()) { if(!player.isConnected()) {
Debugger.debug("addToQueue method called, but player is not connected"); Debug.info("addToQueue method called, but player is not connected");
return false; return false;
} }
Debugger.debug("addToQueue method called for "+player.getName()+" to "+server.getName()); Debug.info("addToQueue method called for "+player.getName()+" to "+server.getName());
if(main.getConfig().getBoolean("joinfrom-server-permission") && !player.hasPermission("ajqueue.joinfrom."+player.getServerName())) { if(main.getConfig().getBoolean("joinfrom-server-permission") && !player.hasPermission("ajqueue.joinfrom."+player.getServerName())) {
player.sendMessage(msgs.getComponent("errors.deny-joining-from-server")); player.sendMessage(msgs.getComponent("errors.deny-joining-from-server"));
@@ -628,7 +628,7 @@ public class QueueManagerImpl implements QueueManager {
nextPlayer.connect(selected); nextPlayer.connect(selected);
server.addPlayer(selected); server.addPlayer(selected);
if(main.getConfig().getBoolean("debug")) { if(main.getConfig().getBoolean("debug")) {
Debugger.debug(selected.getName()+" player count is now set to "+ server.getLastPings().get(selected).getPlayerCount()); Debug.info(selected.getName()+" player count is now set to "+ server.getLastPings().get(selected).getPlayerCount());
} }
} }
} }
common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java
+4 -6
View File
@@ -11,14 +11,12 @@ import us.ajg0702.queue.common.QueueMain;
import us.ajg0702.queue.common.players.QueuePlayerImpl; import us.ajg0702.queue.common.players.QueuePlayerImpl;
import us.ajg0702.queue.common.queues.balancers.DefaultBalancer; import us.ajg0702.queue.common.queues.balancers.DefaultBalancer;
import us.ajg0702.queue.common.queues.balancers.MinigameBalancer; import us.ajg0702.queue.common.queues.balancers.MinigameBalancer;
import us.ajg0702.queue.common.utils.Debugger; import us.ajg0702.queue.common.utils.Debug;
import us.ajg0702.utils.common.Messages; import us.ajg0702.utils.common.Messages;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
public class QueueServerImpl implements QueueServer { public class QueueServerImpl implements QueueServer {
@@ -50,13 +48,13 @@ public class QueueServerImpl implements QueueServer {
balancerType = "default"; balancerType = "default";
balancer = new DefaultBalancer(this, main); balancer = new DefaultBalancer(this, main);
} }
Debugger.debug("Using "+balancerType.toLowerCase(Locale.ROOT)+" balancer for "+name); Debug.info("Using "+balancerType.toLowerCase(Locale.ROOT)+" balancer for "+name);
break; break;
} }
} }
if(balancer == null) { if(balancer == null) {
balancer = new DefaultBalancer(this, main); balancer = new DefaultBalancer(this, main);
Debugger.debug("Using default balancer for "+name); Debug.info("Using default balancer for "+name);
} }
for(QueuePlayer queuePlayer : previousPlayers) { for(QueuePlayer queuePlayer : previousPlayers) {
@@ -427,7 +425,7 @@ public class QueueServerImpl implements QueueServer {
@Override @Override
public AdaptedServer getIdealServer(AdaptedPlayer player) { public AdaptedServer getIdealServer(AdaptedPlayer player) {
Debugger.debug(getBalancer().toString()); Debug.info(getBalancer().toString());
return getBalancer().getIdealServer(player); return getBalancer().getIdealServer(player);
} }
common/src/main/java/us/ajg0702/queue/common/utils/Debugger.java → common/src/main/java/us/ajg0702/queue/common/utils/Debug.java
+2 -2
View File
@@ -2,8 +2,8 @@ package us.ajg0702.queue.common.utils;
import us.ajg0702.queue.api.AjQueueAPI; import us.ajg0702.queue.api.AjQueueAPI;
public class Debugger { public class Debug {
public static void debug(String message) { public static void info(String message) {
AjQueueAPI api = AjQueueAPI.getInstance(); AjQueueAPI api = AjQueueAPI.getInstance();
if(!api.getConfig().getBoolean("debug")) return; if(!api.getConfig().getBoolean("debug")) return;
api.getLogger().info("[debug] "+message); api.getLogger().info("[debug] "+message);
platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java
+2 -2
View File
@@ -13,7 +13,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.players.AdaptedPlayer;
import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.api.server.AdaptedServer;
import us.ajg0702.queue.common.utils.Debugger; import us.ajg0702.queue.common.utils.Debug;
import us.ajg0702.queue.platforms.bungeecord.BungeeQueue; import us.ajg0702.queue.platforms.bungeecord.BungeeQueue;
import us.ajg0702.queue.platforms.bungeecord.server.BungeeServer; import us.ajg0702.queue.platforms.bungeecord.server.BungeeServer;
@@ -123,7 +123,7 @@ public class BungeePlayer implements AdaptedPlayer, Audience {
@Override @Override
public void connect(AdaptedServer server) { public void connect(AdaptedServer server) {
Debugger.debug("Attempting to send "+getName()+" to "+server.getName()); Debug.info("Attempting to send "+getName()+" to "+server.getName());
handle.connect(((BungeeServer) server).getHandle()); handle.connect(((BungeeServer) server).getHandle());
} }
platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java
+2 -2
View File
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.players.AdaptedPlayer;
import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.api.server.AdaptedServer;
import us.ajg0702.queue.common.QueueMain; import us.ajg0702.queue.common.QueueMain;
import us.ajg0702.queue.common.utils.Debugger; import us.ajg0702.queue.common.utils.Debug;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@@ -118,7 +118,7 @@ public class VelocityPlayer implements AdaptedPlayer, Audience {
@Override @Override
public void connect(AdaptedServer server) { public void connect(AdaptedServer server) {
Debugger.debug("Attempting to send "+getName()+" to "+server.getName()); Debug.info("Attempting to send "+getName()+" to "+server.getName());
handle.createConnectionRequest((RegisteredServer) server.getHandle()).connect().thenAcceptAsync( handle.createConnectionRequest((RegisteredServer) server.getHandle()).connect().thenAcceptAsync(
result -> { result -> {
if(!result.isSuccessful()) { if(!result.isSuccessful()) {