Bump version (0.5.5-RELEASE):

- Better abstraction

Author: BadAccuracyID

.gradle/7.1/executionHistory/executionHistory.bin

@@ -6,7 +6,7 @@ plugins {
 
 def pluginName = 'LuckyEssentials'
 group 'id.luckynetwork.dev.lyrams.lej'
-version '0.5.4-RELEASE'
+version '0.5.5-RELEASE'
 
 repositories {
     mavenCentral()

.gradle/7.1/executionHistory/executionHistory.lock

@@ -1,10 +1,7 @@
 package id.luckynetwork.dev.lyrams.lej.listeners;
 
 import id.luckynetwork.dev.lyrams.lej.LuckyEssentials;
-import id.luckynetwork.dev.lyrams.lej.managers.whitelist.WhitelistData;
-import id.luckynetwork.dev.lyrams.lej.utils.Utils;
 import lombok.AllArgsConstructor;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -19,49 +16,17 @@ public class ConnectionListeners implements Listener {
 
     @EventHandler
     public void onLogin(PlayerLoginEvent event) {
-        if (plugin.getWhitelistManager().isEnabled() && event.getResult() == PlayerLoginEvent.Result.ALLOWED) {
-            Player player = event.getPlayer();
-            boolean allowed = false;
-            switch (plugin.getWhitelistManager().getCheckMode()) {
-                case UUID: {
-                    allowed = plugin.getWhitelistManager().getWhitelistedList().stream().map(WhitelistData::getUuid).anyMatch(it -> it.equals(player.getUniqueId().toString()));
-                    break;
-                }
-                case NAME: {
-                    allowed = plugin.getWhitelistManager().getWhitelistedList().stream().map(WhitelistData::getName).anyMatch(it -> it.equals(player.getName()));
-                    break;
-                }
-                case BOTH: {
-                    allowed = plugin.getWhitelistManager().getWhitelistedList().stream().anyMatch(it -> it.getUuid().equals(player.getUniqueId().toString()) && it.getName().equals(player.getName()));
-                    break;
-                }
-            }
-
-            if (!allowed) {
+        if (event.getResult().equals(PlayerLoginEvent.Result.ALLOWED)) {
+            boolean canJoin = plugin.getWhitelistManager().canJoin(event.getPlayer());
+            if (!canJoin) {
                 event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, plugin.getWhitelistManager().getDenyMessage());
             }
         }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onLogin2(PlayerLoginEvent event) {
-        if (plugin.getSlotsManager().isEnabled()) {
-            PlayerLoginEvent.Result result = event.getResult();
-            if (result.equals(PlayerLoginEvent.Result.KICK_FULL) || result.equals(PlayerLoginEvent.Result.ALLOWED)) {
-                int currentOnline = Bukkit.getOnlinePlayers().size();
-                if (currentOnline < plugin.getSlotsManager().getMaxPlayers()) {
-                    event.allow();
-                    return;
-                }
-
-                Player player = event.getPlayer();
-                if (Utils.checkPermission(player, "join_full")) {
-                    event.allow();
-                } else {
-                    event.disallow(PlayerLoginEvent.Result.KICK_FULL, plugin.getSlotsManager().getDenyMessage());
-                }
-            }
-        }
+        plugin.getSlotsManager().checkJoin(event);
     }
 
     @EventHandler

.gradle/7.1/fileHashes/fileHashes.bin

@@ -5,6 +5,9 @@
 import id.luckynetwork.dev.lyrams.lej.utils.Utils;
 import lombok.Getter;
 import lombok.Setter;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerLoginEvent;
 
 @Getter
 @Setter
@@ -36,4 +39,24 @@ public void save() {
 
         plugin.getSlotsConfig().save();
     }
+
+    public void checkJoin(PlayerLoginEvent event) {
+        if (this.enabled) {
+            PlayerLoginEvent.Result result = event.getResult();
+            if (result.equals(PlayerLoginEvent.Result.KICK_FULL) || result.equals(PlayerLoginEvent.Result.ALLOWED)) {
+                int currentOnline = Bukkit.getOnlinePlayers().size();
+                if (currentOnline < plugin.getSlotsManager().getMaxPlayers()) {
+                    event.allow();
+                    return;
+                }
+
+                Player player = event.getPlayer();
+                if (Utils.checkPermission(player, "join_full")) {
+                    event.allow();
+                } else {
+                    event.disallow(PlayerLoginEvent.Result.KICK_FULL, plugin.getSlotsManager().getDenyMessage());
+                }
+            }
+        }
+    }
 }