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

fix an error with the kick event

Browse Source
This commit is contained in:
ajgeiss0702
2021-08-09 09:12:17 -07:00
parent e08accafae
commit 0d910d391c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
+2 -2
View File
@@ -169,7 +169,7 @@ public class EventHandlerImpl implements EventHandler {
} }
ImmutableList<QueueServer> queuedServers = main.getQueueManager().getPlayerQueues(player); ImmutableList<QueueServer> queuedServers = main.getQueueManager().getPlayerQueues(player);
if(!queuedServers.contains(main.getQueueManager().findServer(from.getName())) && main.getConfig().getBoolean("auto-add-to-queue-on-kick")) { if(from != null && !queuedServers.contains(main.getQueueManager().findServer(from.getName())) && main.getConfig().getBoolean("auto-add-to-queue-on-kick")) {
List<String> reasons = main.getConfig().getStringList("auto-add-kick-reasons"); List<String> reasons = main.getConfig().getStringList("auto-add-kick-reasons");
boolean shouldqueue = false; boolean shouldqueue = false;
@@ -193,7 +193,7 @@ public class EventHandlerImpl implements EventHandler {
} }
assert from != null;
for(QueueServer server : queuedServers) { for(QueueServer server : queuedServers) {
if(!(server.getServerNames().contains(from.getName()))) continue; if(!(server.getServerNames().contains(from.getName()))) continue;
QueuePlayer queuePlayer = server.findPlayer(player); QueuePlayer queuePlayer = server.findPlayer(player);
platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java
+1 -1
View File
@@ -124,7 +124,7 @@ public class BungeeQueue extends Plugin implements Listener {
Component reason = BungeeComponentSerializer.get().deserialize(e.getKickReasonComponent()); Component reason = BungeeComponentSerializer.get().deserialize(e.getKickReasonComponent());
main.getEventHandler().onServerKick( main.getEventHandler().onServerKick(
new BungeePlayer(e.getPlayer()), new BungeePlayer(e.getPlayer()),
new BungeeServer(e.getCancelServer()), new BungeeServer(e.getKickedFrom()),
reason, reason,
false false
); );