Merge pull request #36 from ElCholoGamer/develop

Grazen0 · web-flow · commit bafa6e754ad7 · 2022-01-08T13:05:56.000-05:00
v2.13.0
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.elchologamer</groupId>
     <artifactId>UserLogin</artifactId>
-    <version>2.12.1</version>
+    <version>2.13.0</version>
     <packaging>jar</packaging>
 
     <name>UserLogin</name>
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-            <version>3.12.0</version>
+            <version>3.12.10</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/com/elchologamer/userlogin/ULPlayer.java b/src/main/java/com/elchologamer/userlogin/ULPlayer.java
@@ -53,7 +53,7 @@ public void onJoin(boolean fromOtherServer) {
         Player player = getPlayer();
 
         // Teleport to login position
-        if (plugin.getConfig().getBoolean("teleports.toLogin")) {
+        if (plugin.getConfig().getBoolean("teleports.toLogin", plugin.getConfig().getBoolean("teleports.preLogin", true))) {
             player.teleport(plugin.getLocations().getLocation("login", player.getWorld().getSpawnLocation()));
         }
 
@@ -62,20 +62,23 @@ public void onJoin(boolean fromOtherServer) {
             return;
         }
 
+        if (ipForgor != -1) {
+            plugin.getServer().getScheduler().cancelTask(ipForgor);
+            ipForgor = -1;
+        }
+
         // Bypass if IP is registered
-        if (plugin.getConfig().getBoolean("ipRecords.enabled")) {
-            if (ip != null) {
-                InetSocketAddress addr = player.getAddress();
-                if (addr != null && addr.getHostString().equals(ip)) {
-                    onAuthenticate(AuthType.LOGIN);
-                    return;
-                }
-            }
+        if (ip != null) {
+            boolean ret = false;
+            InetSocketAddress addr = player.getAddress();
 
-            if (ipForgor != -1) {
-                plugin.getServer().getScheduler().cancelTask(ipForgor);
-                ipForgor = -1;
+            if (addr != null && addr.getHostString().equals(ip)) {
+                onAuthenticate(AuthType.LOGIN);
+                ret = true;
             }
+
+            ip = null;
+            if (ret) return;
         }
 
         schedulePreLoginTasks();
@@ -92,14 +95,28 @@ public void onQuit() {
                 plugin.getLocations().savePlayerLocation(getPlayer());
             }
 
+            long rememberIp = -1;
+
+            if (plugin.getConfig().isConfigurationSection("ipRecords")) {
+                if (plugin.getConfig().getBoolean("ipRecords.enabled")) {
+                    rememberIp = plugin.getConfig().getLong("ipRecords.delay");
+                }
+            } else {
+                rememberIp = plugin.getConfig().getLong("ipCache");
+            }
+
             // Store IP address if enabled
-            if (plugin.getConfig().getBoolean("ipRecords.enabled")) {
+            if (rememberIp >= 0) {
                 // Schedule IP deletion
-                ipForgor = plugin.getServer().getScheduler().scheduleSyncDelayedTask(
-                        plugin,
-                        () -> ip = null,
-                        plugin.getConfig().getLong("ipRecords.delay", 10) * 20
-                );
+                InetSocketAddress addr = getPlayer().getAddress();
+                if (addr != null) {
+                    ip = addr.getHostString();
+                    ipForgor = plugin.getServer().getScheduler().scheduleSyncDelayedTask(
+                            plugin,
+                            () -> ip = null,
+                            rememberIp * 20
+                    );
+                }
             }
         }
     }
@@ -116,15 +133,15 @@ public void onAuthenticate(AuthType type) {
 
         boolean bungeeEnabled = config.getBoolean("bungeeCord.enabled");
         if (bungeeEnabled) {
-            String targetServer = config.getString("bungeeCord.spawnServer");
+            String targetServer = config.getString("bungeeCord.targetServer", config.getString("bungeeCord.spawnServer"));
             event = new AuthenticationEvent(player, type, targetServer);
         } else {
             Location target = null;
             Location spawn = player.getWorld().getSpawnLocation();
 
             if (teleports.getBoolean("savePosition")) {
                 target = plugin.getLocations().getPlayerLocation(player, spawn);
-            } else if (teleports.getBoolean("toSpawn", true)) {
+            } else if (teleports.getBoolean("postLogin", teleports.getBoolean("toSpawn", true))) {
                 target = plugin.getLocations().getLocation("spawn", spawn);
             }
 
@@ -196,8 +213,16 @@ public void schedulePreLoginTasks() {
         Player player = getPlayer();
 
         // Timeout
-        if (plugin.getConfig().getBoolean("timeout.enabled", true)) {
-            long timeoutDelay = plugin.getConfig().getLong("timeout.time");
+        long timeoutDelay = -1;
+        if (plugin.getConfig().isConfigurationSection("timeout")) {
+            if (plugin.getConfig().getBoolean("timeout.enabled")) {
+                timeoutDelay = plugin.getConfig().getLong("timeout.time");
+            }
+        } else {
+            timeoutDelay = plugin.getConfig().getLong("timeout");
+        }
+
+        if (timeoutDelay >= 0) {
             timeout = player.getServer().getScheduler().scheduleSyncDelayedTask(
                     plugin,
                     () -> player.kickPlayer(plugin.getLang().getMessage("messages.timeout")),
@@ -207,12 +232,12 @@ public void schedulePreLoginTasks() {
 
 
         // Repeating welcome message
-        long interval = plugin.getConfig().getLong("repeatingWelcomeMsg", -1) * 20;
+        long interval = plugin.getConfig().getLong("repeatWelcomeMessage", plugin.getConfig().getLong("repeatingWelcomeMsg", -1));
         if (interval > 0) {
             welcomeMessage = player.getServer().getScheduler().scheduleSyncRepeatingTask(
                     plugin,
                     this::sendWelcomeMessage,
-                    interval, interval
+                    interval * 20, interval * 20
             );
         }
     }
diff --git a/src/main/java/com/elchologamer/userlogin/UserLogin.java b/src/main/java/com/elchologamer/userlogin/UserLogin.java
@@ -19,6 +19,7 @@
 import com.elchologamer.userlogin.util.Metrics;
 import com.elchologamer.userlogin.util.Metrics.SimplePie;
 import com.elchologamer.userlogin.util.Utils;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -45,6 +46,8 @@ public void onEnable() {
 
         reloadPlugin();
 
+        getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
+
         // Register FastLogin hook
         if (getServer().getPluginManager().isPluginEnabled("FastLogin")) {
             new FastLoginHook().register();
@@ -75,6 +78,7 @@ public void onEnable() {
         registerEvents(new ItemDropRestriction());
         registerEvents(new AttackRestriction());
         registerEvents(new ReceiveDamageRestriction());
+        registerEvents(new InventoryClickRestriction());
 
         // Register Item Pickup restriction if class exists
         try {
@@ -171,6 +175,14 @@ private void registerEvents(Listener listener) {
 
     @Override
     public void onDisable() {
+        if (getConfig().getBoolean("teleports.savePosition")) {
+            for (Player player : getServer().getOnlinePlayers()) {
+                if (ULPlayer.get(player).isLoggedIn()) {
+                    locationsManager.savePlayerLocation(player);
+                }
+            }
+        }
+
         if (db != null) {
             try {
                 db.disconnect();
diff --git a/src/main/java/com/elchologamer/userlogin/command/AuthCommand.java b/src/main/java/com/elchologamer/userlogin/command/AuthCommand.java
@@ -3,11 +3,12 @@
 import com.elchologamer.userlogin.ULPlayer;
 import com.elchologamer.userlogin.UserLogin;
 import com.elchologamer.userlogin.api.types.AuthType;
+import com.elchologamer.userlogin.command.base.AsyncCommand;
 import com.elchologamer.userlogin.command.base.BaseCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public abstract class AuthCommand extends BaseCommand {
+public abstract class AuthCommand extends AsyncCommand {
 
     private final AuthType type;
     private final int minArgs;
@@ -26,7 +27,7 @@ public UserLogin getPlugin() {
     }
 
     @Override
-    public final boolean run(CommandSender sender, String label, String[] args) {
+    public final boolean asyncRun(CommandSender sender, String label, String[] args) {
         ULPlayer ulPlayer = ULPlayer.get((Player) sender);
 
         // Check if player is already logged in
diff --git a/src/main/java/com/elchologamer/userlogin/command/base/AsyncCommand.java b/src/main/java/com/elchologamer/userlogin/command/base/AsyncCommand.java
@@ -0,0 +1,25 @@
+package com.elchologamer.userlogin.command.base;
+
+import org.bukkit.command.CommandSender;
+
+public abstract class AsyncCommand extends BaseCommand {
+
+    public AsyncCommand(String name) {
+        super(name);
+    }
+
+    public AsyncCommand(String name, boolean playerOnly) {
+        super(name, playerOnly);
+    }
+
+    @Override
+    public final boolean run(CommandSender sender, String label, String[] args) {
+        getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), () -> {
+            boolean success = asyncRun(sender, label, args);
+            if (!success) sender.sendMessage(getUsage());
+        });
+        return true;
+    }
+
+    public abstract boolean asyncRun(CommandSender sender, String label, String[] args);
+}
diff --git a/src/main/java/com/elchologamer/userlogin/command/sub/SetCommand.java b/src/main/java/com/elchologamer/userlogin/command/sub/SetCommand.java
@@ -24,7 +24,14 @@ public boolean run(CommandSender sender, String[] args) {
         if (args.length == 0) return false;
 
         String type = args[0].toLowerCase();
-        if (!type.equals("spawn") && !type.equals("login")) return false;
+        if (!type.equals("spawn") && !type.equals("login") && !type.equals("prelogin") && !type.equals("postlogin"))
+            return false;
+
+        if (type.equals("prelogin")) {
+            type = "login";
+        } else if (type.equals("postlogin")) {
+            type = "spawn";
+        }
 
         ULPlayer ulPlayer = ULPlayer.get((Player) sender);
         Player player = ulPlayer.getPlayer();
@@ -36,7 +43,7 @@ public boolean run(CommandSender sender, String[] args) {
         // Send message
         ulPlayer.sendMessage(
                 "commands.set",
-                new QuickMap<>("type", (Object) type)
+                new QuickMap<>("type", (Object) args[0].toLowerCase())
                         .set("x", (int) loc.getX())
                         .set("y", (int) loc.getY())
                         .set("z", (int) loc.getZ())
@@ -53,8 +60,8 @@ public List<String> tabComplete(CommandSender sender, String alias, String[] arg
         List<String> options = new ArrayList<>();
 
         if (args.length == 1) {
-            options.add("login");
-            options.add("spawn");
+            options.add("prelogin");
+            options.add("postlogin");
         }
 
         return options;
diff --git a/src/main/java/com/elchologamer/userlogin/listener/JoinQuitListener.java b/src/main/java/com/elchologamer/userlogin/listener/JoinQuitListener.java
@@ -11,7 +11,7 @@ public class JoinQuitListener implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
-        if (UserLogin.getPlugin().getConfig().getBoolean("disableVanillaJoinMessages")) {
+        if (!UserLogin.getPlugin().getConfig().getBoolean("vanillaJoinMessages", !UserLogin.getPlugin().getConfig().getBoolean("disableVanillaJoinMessages", true))) {
             event.setJoinMessage(null);
         }
         ULPlayer.get(event.getPlayer()).onJoin(false);
diff --git a/src/main/java/com/elchologamer/userlogin/listener/restriction/InventoryClickRestriction.java b/src/main/java/com/elchologamer/userlogin/listener/restriction/InventoryClickRestriction.java
@@ -0,0 +1,25 @@
+package com.elchologamer.userlogin.listener.restriction;
+
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.inventory.InventoryClickEvent;
+
+public class InventoryClickRestriction extends BaseRestriction<InventoryClickEvent> {
+    public InventoryClickRestriction() {
+        super("inventoryClick");
+    }
+
+    @EventHandler
+    public void handle(InventoryClickEvent event) {
+        if (shouldRestrict(event)) event.setCancelled(true);
+    }
+
+    @Override
+    protected Player getEventPlayer(InventoryClickEvent event) {
+        HumanEntity entity = event.getWhoClicked();
+
+        if (!(entity instanceof Player)) return null;
+        return (Player) entity;
+    }
+}
diff --git a/src/main/java/com/elchologamer/userlogin/manager/LangManager.java b/src/main/java/com/elchologamer/userlogin/manager/LangManager.java
@@ -22,7 +22,7 @@ public void createDefault() {
         File folder = new File(plugin.getDataFolder(), "lang");
         folder.mkdirs();
 
-        String[] langs = {"en_US", "es_ES"};
+        String[] langs = {"en_US", "es_ES", "pt_BR"};
 
         for (String lang : langs) {
             try {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
diff --git a/src/main/resources/lang/en_US.yml b/src/main/resources/lang/en_US.yml
diff --git a/src/main/resources/lang/es_ES.yml b/src/main/resources/lang/es_ES.yml
diff --git a/src/main/resources/lang/pt_BR.yml b/src/main/resources/lang/pt_BR.yml

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class JoinQuitListener implements Listener {`
`11`	`11`
`12`	`12`	`@EventHandler`
`13`	`13`	`public void onPlayerJoin(PlayerJoinEvent event) {`
`14`		`- if (UserLogin.getPlugin().getConfig().getBoolean("disableVanillaJoinMessages")) {`
	`14`	`+ if (!UserLogin.getPlugin().getConfig().getBoolean("vanillaJoinMessages", !UserLogin.getPlugin().getConfig().getBoolean("disableVanillaJoinMessages", true))) {`
`15`	`15`	`event.setJoinMessage(null);`
`16`	`16`	`}`
`17`	`17`	`ULPlayer.get(event.getPlayer()).onJoin(false);`