Update 1.0.5: Resolve safe position for custom plot homes (#6)

KCodeYT · Jun 7, 2022 · 13826a0 · 13826a0
1 parent 1635152
commit 13826a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ms.kevi</groupId>
     <artifactId>plotplugin</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

diff --git a/src/main/java/ms/kevi/plotplugin/manager/PlotManager.java b/src/main/java/ms/kevi/plotplugin/manager/PlotManager.java
@@ -1046,10 +1046,15 @@ public void teleportPlayerToPlot(Player player, Plot plot, boolean homeAllowed)
 
         if(homeAllowed) {
             final Vector3 homePosition = plot.getHomePosition();
-            if(homePosition != null) plotVec = homePosition;
+            if(homePosition != null) plotVec = homePosition.clone();
         }
 
-        player.teleport(Location.fromObject(plotVec, this.level));
+        for(int y = plotVec.getFloorY(); this.level.isOverWorld() ? y <= 319 : y <= 255; y++) {
+            plotVec.setY(y);
+            if(this.level.standable(plotVec)) break;
+        }
+
+        player.teleport(plotVec);
     }
 
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Plots
-version: "1.0.4"
+version: "1.0.5"
 api: [ "1.0.13" ]
 author: Kevims
 main: ms.kevi.plotplugin.PlotPlugin