From 337a612437a01bfecc918582d6fece34437da978 Mon Sep 17 00:00:00 2001
From: Super_ <awesomegamer156@gmail.com>
Date: Mon, 18 Nov 2019 16:45:18 -0500
Subject: [PATCH] tpr on join (#153)

---
 .../me/totalfreedom/totalfreedommod/LoginProcess.java | 11 ++++++++---
 .../totalfreedommod/command/Command_toggle.java       |  8 +++++++-
 .../totalfreedommod/config/ConfigEntry.java           |  1 +
 src/main/resources/config.yml                         |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
index c8a6886d..33a7c49f 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
@@ -192,19 +192,24 @@ public class LoginProcess extends FreedomService
         player.sendTitle(ChatColor.GRAY + "Welcome to " + ChatColor.YELLOW + "TotalFreedom!", ChatColor.GREEN + "Celebrating 9 years!", 20, 100, 60);
         player.setOp(true);
 
-        if (ConfigEntry.ALLOW_CLEAR_ON_JOIN.getBoolean())
+        if (ConfigEntry.ALLOW_TPR_ON_JOIN.getBoolean())
         {
-            player.getInventory().clear();
             int x = FUtil.random(-10000, 10000);
             int z = FUtil.random(-10000, 10000);
             int y = player.getWorld().getHighestBlockYAt(x, z);
             Location location = new Location(player.getLocation().getWorld(), x, y, z);
             player.teleport(location);
-            player.sendMessage(ChatColor.AQUA + "Your inventory has been cleared automatically.");
             player.sendMessage(ChatColor.GOLD + "You have been teleported to a random location automatically.");
             return;
         }
 
+        if (ConfigEntry.ALLOW_CLEAR_ON_JOIN.getBoolean())
+        {
+            player.getInventory().clear();
+            player.sendMessage(ChatColor.AQUA + "Your inventory has been cleared automatically.");
+            return;
+        }
+
         if (!ConfigEntry.SERVER_TABLIST_HEADER.getString().isEmpty())
         {
             player.setPlayerListHeader(FUtil.colorize(ConfigEntry.SERVER_TABLIST_HEADER.getString()).replace("\\n", "\n"));
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java
index 2d64d35c..726ced1e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java
@@ -40,6 +40,7 @@ public class Command_toggle extends FreedomCommand
             msg("- bells");
             msg("- armorstands");
             msg("- clearonjoin");
+            msg("- tpronjoin");
             return false;
         }
 
@@ -177,6 +178,11 @@ public class Command_toggle extends FreedomCommand
             toggle("The clearing of inventories on join is", ConfigEntry.ALLOW_CLEAR_ON_JOIN);
             return true;
         }
+        else if (args[0].equalsIgnoreCase("tpronjoin"))
+        {
+            toggle("The random teleporting of players on join is ", ConfigEntry.ALLOW_TPR_ON_JOIN);
+            return true;
+        }
         else
         {
             return false;
@@ -195,7 +201,7 @@ public class Command_toggle extends FreedomCommand
         {
             return Arrays.asList(
                     "waterplace", "fireplace", "lavaplace", "fluidspread", "lavadmg", "firespread", "frostwalk",
-                    "firework", "prelog", "lockdown", "petprotect", "entitywipe", "nonuke", "explosives", "unsafeenchs", "bells", "armorstands", "clearonjoin");
+                    "firework", "prelog", "lockdown", "petprotect", "entitywipe", "nonuke", "explosives", "unsafeenchs", "bells", "armorstands", "clearonjoin", "tpronjoin");
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java
index 62230210..19915e89 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java
@@ -26,6 +26,7 @@ public enum ConfigEntry
     ALLOW_ARMOR_STANDS(Boolean.class, "allow.armorstands"),
     ALLOW_MINECARTS (Boolean.class, "allow.minecarts"),
     ALLOW_CLEAR_ON_JOIN(Boolean.class, "allow.clearonjoin"),
+    ALLOW_TPR_ON_JOIN(Boolean.class, "allow.tpronjoin"),
     //
     BLOCKED_CHATCODES(String.class, "blocked_chatcodes"),
     //
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 8b814c25..f7d8fc11 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -125,6 +125,7 @@ allow:
   armorstands: false
   minecarts: false
   clearonjoin: false
+  tpronjoin: false
 
 # Blocked commands:
 #