Merge pull request #20 from Craftstuebchen/master

Removed .DS_Store files, added support for https://hub.spigotmc.org/s…

.gitignore

@@ -1,10 +1,10 @@
-/bin/
+bin/
-/.git/
+.git/
-/.settings/
+.settings/
-/.classpath
+.classpath/
-/.project
+.project/
 target
 .idea
 *.iml
-/BetterRTP.wiki
+BetterRTP.wiki/
-/BetterRTP
+.DS_Store

pom.xml

@@ -26,10 +26,12 @@
             <id>sk89q-repo</id>
             <url>http://maven.sk89q.com/repo/</url>
         </repository>
-        <!--<repository>
+
-            <id>minecraftforge</id>
+        <repository>
-            <url>https://files.minecraftforge.net/maven</url>
+            <id>jitpack.io</id>
-        </repository>-->
+            <url>https://jitpack.io</url>
+        </repository>
+
     </repositories>
     <dependencies>
         <!--Spigot API-->
@@ -49,7 +51,7 @@
         <dependency> <!-- Spigot (this includes Spigot API, Bukkit API, Craftbukkit and NMS) -->
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.14-R0.1-SNAPSHOT</version>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -64,12 +66,11 @@
             <version>6.1</version>
             <scope>provided</scope>
         </dependency>
-        <!--<dependency>
+        <dependency>
-            <groupId>me.ryanhamshire</groupId>
+            <groupId>com.github.TechFortress</groupId>
-            <artifactId>griefprevention</artifactId>
+            <artifactId>GriefPrevention</artifactId>
-            <version>1.10.2-4.0.1.451</version>
+            <version>16.7.1</version>
-            <classifier>api</classifier>
             <scope>provided</scope>
-        </dependency>-->
+        </dependency>
     </dependencies>
 </project>

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);
+        Block b = world.getHighestBlockAt(x, z);
-        String block = world.getBlockAt(x, y - 1, z).getType().name();
+        if (!badBlock(b.getType().name(), x, z, pWorld.getWorld(), pWorld.getBiomes()))
-        if (!badBlock(block, x, z, pWorld.getWorld(), pWorld.getBiomes()))
+            return new Location(world, (x + 0.5), b.getY() + 1, (z + 0.5), yaw, pitch);
-            return new Location(world, (x + 0.5), y, (z + 0.5), yaw, pitch);
         return null;
     }