zHomes 2.1.5

Author: yL3oft

.github/workflows/test-compile.yml

@@ -32,8 +32,14 @@ jobs:
       - name: Compile and Test with Maven
         run: mvn clean install -DskipTests=false -Dgpg.skip=true
 
+      - name: Get project version
+        id: get_version
+        run: |
+          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
       - name: Upload target artifact
         uses: actions/upload-artifact@v4
         with:
-          name: target-artifact
+          name: zHomes ${{ steps.get_version.outputs.version }}
           path: target/

.idea/modules.xml

@@ -1,10 +1,9 @@
 ## Dependency Changes
-- Plugin now uses [zAPI 1.4.4](https://github.com/yL3oft/zAPI/releases/tag/1.4.4)
+- Plugin now uses [zAPI 1.4.6](https://github.com/yL3oft/zAPI/releases/tag/1.4.6)
 
 ## General Changes
-- Fixed folia support (Finally!)
-- Fixed permission registration
-- Code cleanup and optimizations
+- Fixed and optimized safe location finding on teleport, special thanks for `coldironzz` and `Don (deadeye22122)` for reporting
+- You can now use chances on commands in the items from custom menus: `[<chance (ex: 30.0)>] [CON|INV] (command)`
 
-**zAPI Changelog**: https://github.com/yL3oft/zAPI/compare/1.4.3...1.4.4
-**Full Changelog**: https://github.com/yL3oft/zHomes/compare/2.1.3...2.1.4
+**zAPI Changelog**: https://github.com/yL3oft/zAPI/compare/1.4.4...1.4.6
+**Full Changelog**: https://github.com/yL3oft/zHomes/compare/2.1.4...2.1.5

changelog.md

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

dependency-reduced-pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.yleoft</groupId>
     <artifactId>zHomes</artifactId>
-    <version>2.1.4</version>
+    <version>2.1.5</version>
     <description>Your new favorite homes plugin</description>
     <url>https://github.com/yL3oft/zHomes</url>
     <packaging>jar</packaging>
@@ -261,7 +261,7 @@
         <dependency>
             <groupId>me.yleoft</groupId>
             <artifactId>zAPI</artifactId>
-            <version>1.4.4</version>
+            <version>1.4.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

pom.xml

@@ -370,6 +370,7 @@ public void loadCommands() {
             registerPermission(cfgu.CmdHomeOthersPermission(), "Permission to use the '/" + cfgu.CmdHomeCommand() + " (Player:Home)' command", PermissionDefault.OP);
             registerPermission(cfgu.PermissionBypassLimit(), "Bypass homes limit", PermissionDefault.OP);
             registerPermission(cfgu.PermissionBypassDT(), "Bypass dimensional teleportation config", PermissionDefault.OP);
+            registerPermission(cfgu.PermissionBypassWarmup(), "Bypass teleportation warmup time", PermissionDefault.OP);
         } catch (Exception e) {
             helper.sendMsg(getServer().getConsoleSender(), this.coloredPluginName + "§cError registering permissions (This doesn't affect anything in general)!");
         }

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

@@ -1,5 +1,6 @@
 package me.yleoft.zHomes.utils;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
 
@@ -15,6 +16,7 @@
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent;
 
 import static me.yleoft.zAPI.utils.LocationUtils.*;
 
@@ -83,37 +85,46 @@ public void teleportPlayer(Player p, OfflinePlayer t, String home) {
             lang.sendMsg(p, lang.getCantDimensionalTeleport());
             return;
         }
-        findNearestSafeLocationAsync(loc, 4, 50, tpLoc -> {
-            if (tpLoc == null) {
-                new LanguageUtils.CommandsMSG().sendMsg(p, "Unable to find a safe location");
-                return;
-            }
-            String homeString = p.getUniqueId() == t.getUniqueId() ? home : t.getName() + ":" + home;
-            Runnable task = () -> {
-                Sound sound = getTeleportSound();
-                if (zAPI.isFolia()) {
-                    try {
-                        Method teleportAsyncMethod = Player.class.getMethod("teleportAsync", Location.class);
-                        teleportAsyncMethod.invoke(p, tpLoc);
-                    } catch (Exception e) {
-                        throw new RuntimeException("Unable to teleport player", e);
+        SchedulerUtils.runTask(loc, new FoliaRunnable() {
+            @Override
+            public void run() {
+                Location tpLoc = findNearestSafeLocation(loc, 4, 50);
+                if(tpLoc == null) {
+                    LanguageUtils.CommandsMSG cmdm = new LanguageUtils.CommandsMSG();
+                    cmdm.sendMsg(p, cmdm.getUnableToFindSafeLocation());
+                    return;
+                }
+                String homeString = p.getUniqueId() == t.getUniqueId() ? home : t.getName() + ":" + home;
+                Runnable task = () -> {
+                    Sound sound = getTeleportSound();
+                    if (zAPI.isFolia()) {
+                        try {
+                            Method teleportAsyncMethod = Player.class.getMethod("teleportAsync", Location.class);
+                            teleportAsyncMethod.invoke(p, tpLoc);
+                            SchedulerUtils.runTask(tpLoc, () -> {
+                                if (sound != null && playSound()) p.playSound(p.getLocation(), sound, 1.0F, 1.0F);
+                            });
+                        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+                            throw new RuntimeException("Unable to teleport player to home", e);
+                        }
+                    }else {
+                        SchedulerUtils.runTaskLater(tpLoc, () -> {
+                            p.teleport(tpLoc, PlayerTeleportEvent.TeleportCause.PLUGIN);
+                            SchedulerUtils.runTask(tpLoc, () -> {
+                                if (sound != null && playSound()) p.playSound(p.getLocation(), sound, 1.0F, 1.0F);
+                            });
+                        }, 1L);
                     }
-                } else {
-                    SchedulerUtils.runTaskLater(tpLoc, () -> p.teleport(tpLoc), 1L);
+                    lang.sendMsg(p, lang.getOutput(homeString));
+                };
+                if(doWarmup() && !p.hasPermission(PermissionBypassWarmup()) && warmupTime() > 0) {
+                    LanguageUtils.TeleportWarmupMSG langWarmup = new LanguageUtils.TeleportWarmupMSG();
+                    lang.sendMsg(p, langWarmup.getWarmup(warmupTime()));
+                    startWarmup(p, langWarmup, lang, homeString, task);
+                    return;
                 }
-
-                lang.sendMsg(p, lang.getOutput(homeString));
-                if (sound != null && playSound()) p.playSound(p.getLocation(), sound, 1.0F, 1.0F);
-            };
-
-            if (doWarmup() && !p.hasPermission(PermissionBypassWarmup()) && warmupTime() > 0) {
-                LanguageUtils.TeleportWarmupMSG warmupMsg = new LanguageUtils.TeleportWarmupMSG();
-                lang.sendMsg(p, warmupMsg.getWarmup(warmupTime()));
-                startWarmup(p, warmupMsg, lang, homeString, task);
-                return;
+                task.run();
             }
-
-            task.run();
         });
     }
     public void teleportPlayer(Player p, String home) {