new algorithm to teleport the player to the ground in a menu conversa…

…tion
Wolf2323 · Oct 23, 2023 · f8827f0 · f8827f0
1 parent f461696
commit f8827f0
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/...ain/java/org/betonquest/betonquest/compatibility/protocollib/conversation/MenuConvIO.java b/...ain/java/org/betonquest/betonquest/compatibility/protocollib/conversation/MenuConvIO.java
@@ -27,6 +27,7 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Slab;
 import org.bukkit.configuration.ConfigurationSection;
@@ -218,12 +219,7 @@ private void start() {
 
             final World world = player.getWorld();
             final Location location = player.getLocation();
-            final Location target = location.clone();
-            target.setY(world.getHighestBlockYAt(location));
-            final BlockData blockData = target.getBlock().getBlockData();
-            if (blockData instanceof final Slab slab && slab.getType() == Slab.Type.BOTTOM) {
-                target.add(0, -0.5, 0);
-            }
+            final Location target = getBlockBelowPlayer(location);
             stand = world.spawn(target.add(0, -0.375, 0), ArmorStand.class);
 
             stand.setGravity(false);
@@ -250,6 +246,21 @@ private void start() {
         }
     }
 
+    private Location getBlockBelowPlayer(final Location location) {
+        final Location target = location.clone();
+        Block block = target.getBlock();
+        while (!block.isSolid()) {
+            target.add(0, -1, 0);
+            block = target.getBlock();
+        }
+        target.setY(block.getY());
+        final BlockData blockData = block.getBlockData();
+        if (blockData instanceof final Slab slab && slab.getType() == Slab.Type.BOTTOM) {
+            target.add(0, -0.5, 0);
+        }
+        return target;
+    }
+
     /**
      * Displays all data to the player. Should be called after setting all
      * options.