diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index af54a92..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 3f46f5e..cec7534 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ -/bin/ -/.git/ -/.settings/ -/.classpath -/.project +bin/ +.git/ +.settings/ +.classpath/ +.project/ target .idea *.iml -/BetterRTP.wiki -/BetterRTP \ No newline at end of file +BetterRTP.wiki/ +.DS_Store \ No newline at end of file diff --git a/pom.xml b/pom.xml index cf561a8..8077581 100644 --- a/pom.xml +++ b/pom.xml @@ -26,10 +26,12 @@ sk89q-repo http://maven.sk89q.com/repo/ - + + + jitpack.io + https://jitpack.io + + @@ -49,7 +51,7 @@ org.spigotmc spigot - 1.14-R0.1-SNAPSHOT + 1.15.2-R0.1-SNAPSHOT provided @@ -64,12 +66,11 @@ 6.1 provided - + \ No newline at end of file diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store deleted file mode 100644 index 133a14c..0000000 Binary files a/src/main/java/.DS_Store and /dev/null differ diff --git a/src/main/java/me/.DS_Store b/src/main/java/me/.DS_Store deleted file mode 100644 index cfb2eba..0000000 Binary files a/src/main/java/me/.DS_Store and /dev/null differ diff --git a/src/main/java/me/SuperRonanCraft/.DS_Store b/src/main/java/me/SuperRonanCraft/.DS_Store deleted file mode 100644 index f8ae463..0000000 Binary files a/src/main/java/me/SuperRonanCraft/.DS_Store and /dev/null differ diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/.DS_Store b/src/main/java/me/SuperRonanCraft/BetterRTP/.DS_Store deleted file mode 100644 index 13ce596..0000000 Binary files a/src/main/java/me/SuperRonanCraft/BetterRTP/.DS_Store and /dev/null differ diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java index 876149b..0a28194 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java @@ -4,15 +4,16 @@ import com.sk89q.worldguard.bukkit.RegionContainer; import com.sk89q.worldguard.bukkit.WGBukkit; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.protection.managers.RegionManager; +import me.SuperRonanCraft.BetterRTP.Main; import me.SuperRonanCraft.BetterRTP.references.file.FileBasics; import me.SuperRonanCraft.BetterRTP.references.worlds.Custom; import me.SuperRonanCraft.BetterRTP.references.worlds.Default; import me.SuperRonanCraft.BetterRTP.references.worlds.PlayerWorld; import me.SuperRonanCraft.BetterRTP.references.worlds.RTPWorld; -import me.SuperRonanCraft.BetterRTP.Main; import me.ryanhamshire.GriefPrevention.GriefPrevention; import org.bukkit.*; import org.bukkit.block.Biome; +import org.bukkit.block.Block; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -124,7 +125,7 @@ public class RTP { } private void sendPlayer(final CommandSender sendi, final Player p, final Location loc, final int price, - final int attempts) throws NullPointerException { + final int attempts) throws NullPointerException { if (sendi != p) checkPH(sendi, p.getDisplayName(), loc, price, false, attempts); if (pl.getText().getTitleSuccessChat()) @@ -273,10 +274,9 @@ public class RTP { } private Location getLocAtNormal(int x, int z, World world, Float yaw, Float pitch, PlayerWorld pWorld) { - int y = world.getHighestBlockYAt(x, z); - String block = world.getBlockAt(x, y - 1, z).getType().name(); - if (!badBlock(block, x, z, pWorld.getWorld(), pWorld.getBiomes())) - return new Location(world, (x + 0.5), y, (z + 0.5), yaw, pitch); + Block b = world.getHighestBlockAt(x, z); + if (!badBlock(b.getType().name(), x, z, pWorld.getWorld(), pWorld.getBiomes())) + return new Location(world, (x + 0.5), b.getY() + 1, (z + 0.5), yaw, pitch); return null; }