zHomes 2.1.6

Author: yL3oft

dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>me.yleoft</groupId>
   <artifactId>zHomes</artifactId>
   <name>zHomes</name>
-  <version>2.1.5-SNAPSHOT</version>
+  <version>2.1.6</version>
   <description>Your new favorite homes plugin</description>
   <url>https://github.com/yL3oft/zHomes</url>
   <developers>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.yleoft</groupId>
     <artifactId>zHomes</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6</version>
     <description>Your new favorite homes plugin</description>
     <url>https://github.com/yL3oft/zHomes</url>
     <packaging>jar</packaging>

src/main/java/me/yleoft/zHomes/Main.java

@@ -369,6 +369,7 @@ public void loadCommands() {
             registerPermission(cfgu.CmdHomeRenamePermission(), "Permission to use the '/" + cfgu.CmdHomeCommand() + " rename (Home) (NewName)' command", PermissionDefault.TRUE);
             registerPermission(cfgu.CmdHomeOthersPermission(), "Permission to use the '/" + cfgu.CmdHomeCommand() + " (Player:Home)' command", PermissionDefault.OP);
             registerPermission(cfgu.PermissionBypassLimit(), "Bypass homes limit", PermissionDefault.OP);
+            registerPermission(cfgu.PermissionBypassST(), "Bypass safe teleport", PermissionDefault.FALSE);
             registerPermission(cfgu.PermissionBypassDT(), "Bypass dimensional teleportation config", PermissionDefault.OP);
             registerPermission(cfgu.PermissionBypassWarmup(), "Bypass teleportation warmup time", PermissionDefault.OP);
         } catch (Exception e) {

src/main/java/me/yleoft/zHomes/storage/DatabaseConnection.java

@@ -40,6 +40,9 @@ public String prefix() {
     }
 
     //<editor-fold desc="Plugin Information">
+    public boolean enableSafeTeleport() {
+        return main.getConfig().getBoolean(this.tpo + "enable-safe-teleport");
+    }
     public boolean canDimensionalTeleport() {
         return main.getConfig().getBoolean(this.tpo + "dimensional-teleportation");
     }
@@ -217,6 +220,9 @@ public String PermissionBypassLimit() {
     public String PermissionBypassDT() {
         return main.getConfig().getString(permissionsBypassPath+"dimensional-teleportation");
     }
+    public String PermissionBypassST() {
+        return main.getConfig().getString(permissionsBypassPath+"safe-teleportation");
+    }
     public String PermissionBypassWarmup() {
         return main.getConfig().getString(permissionsBypassPath+"warmup");
     }

src/main/java/me/yleoft/zHomes/utils/ConfigUtils.java

@@ -88,7 +88,7 @@ public void teleportPlayer(Player p, OfflinePlayer t, String home) {
         SchedulerUtils.runTask(loc, new FoliaRunnable() {
             @Override
             public void run() {
-                Location tpLoc = findNearestSafeLocation(loc, 4, 50);
+                Location tpLoc = (enableSafeTeleport() && !p.hasPermission(PermissionBypassST())) ? findNearestSafeLocation(loc, 4, 50) : loc;
                 if(tpLoc == null) {
                     LanguageUtils.CommandsMSG cmdm = new LanguageUtils.CommandsMSG();
                     cmdm.sendMsg(p, cmdm.getUnableToFindSafeLocation());

src/main/java/me/yleoft/zHomes/utils/HomesUtils.java

@@ -40,6 +40,9 @@ general:
 
 # In this section you can change the teleport options for the players
 teleport-options:
+  # This option defines if the plugin should check for a safe location upon trying to teleport to a home.
+  # OPTIONS: [true, false] --- DEFAULT: true
+  enable-safe-teleport: true
   # This option defines if the players can teleport to other dimensions with homes.
   # OPTIONS: [true, false] --- DEFAULT: true
   dimensional-teleportation: true # There is also a permission to bypass in permissions.bypass.dimensional-teleportation in this file
@@ -157,6 +160,9 @@ permissions:
     # This permission allows the player to bypass the dimensional teleportation
     # Default: zhomes.bypass.dimensionalteleportation
     dimensional-teleportation: "zhomes.bypass.dimensionalteleportation" # Only OP by default
+    # Allow player's to bypass safe teleportation
+    # Default: zhomes.bypass.safeteleport
+    safe-teleportation: "zhomes.bypass.safeteleport" # False by default
     # This permission allows the player to bypass the teleportation warmup
     # Default: zhomes.bypass.warmup
     warmup: "zhomes.bypass.warmup" # Only OP by default