From 36cb3b7cb521e647d76d2d1212bed8ba553346a5 Mon Sep 17 00:00:00 2001
From: ysl3000 <yannicklamprecht@live.de>
Date: Tue, 4 Feb 2020 14:53:50 +0100
Subject: [PATCH] Removed .DS_Store files, added support for
 https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/807a677e9a59929e27ac1991c3fa1cf6a2ec0f4d

---
 .DS_Store                                        | Bin 6148 -> 0 bytes
 .gitignore                                       |  14 +++++++-------
 pom.xml                                          |   2 +-
 src/main/java/.DS_Store                          | Bin 6148 -> 0 bytes
 src/main/java/me/.DS_Store                       | Bin 6148 -> 0 bytes
 src/main/java/me/SuperRonanCraft/.DS_Store       | Bin 6148 -> 0 bytes
 .../java/me/SuperRonanCraft/BetterRTP/.DS_Store  | Bin 6148 -> 0 bytes
 .../me/SuperRonanCraft/BetterRTP/player/RTP.java |   2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 src/main/java/.DS_Store
 delete mode 100644 src/main/java/me/.DS_Store
 delete mode 100644 src/main/java/me/SuperRonanCraft/.DS_Store
 delete mode 100644 src/main/java/me/SuperRonanCraft/BetterRTP/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index af54a92fb59922a97366095d8ba072acaaa3e7b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKy-veG47S@0p)3^>W1axijWMdi#Mps_0h*wIl#+_116wAZgE#3*P~L#&0RLRu
zTvH?_gut%OUt;^tcb^oy2LL!;WFvqf0E9Fcg8`{M!hRkd={d_0A<7yx+`|LpP!)M6
z+6=~kG4R_M;BWT;PN0HYsOh))en*qEoXvH+y^H-(vocAtMV$h?F5h1ycF$U~GW$l<
z{H~pm>k;%}%KOQxw3wD<(J~czD;Tf%5H5JTrMI(?3S8T>-o~!SORYsMfC6r~lzEw8
zz?n9_ZLZbF>9gc&`PSLGJ};k?UfO*HkC6ID6_d9C94zHP;%TK1pDrc6TV~7nYRBWH
z#zrQY`lk#~&t?e^6-^rh#(*)fVSwvHM1wJQ*eFWrASK<BFd(xCJxlK<jMzXJJ8Trm
zLV`M#P^Y51VxUeZd*tF`hmE362h=_d=rW_bp`c`^^&<%fj1^5A1IB>QKwn>n-2czN
zzW@7^?9CW32L2QS7$lQqOh<CPwR1S`wGoYL8Y~>wD9RL4t{uw*x8h?OBIJwsfiQO1
SD3XQ5{s;&Sri_6fW#AKlih9KW

diff --git a/.gitignore b/.gitignore
index 3f46f5e..826fb1b 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..c9ce171 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,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>
diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store
deleted file mode 100644
index 133a14cf633d26a8a9b97f2a578f828b5018c384..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ8A<#43%sL3~5}t9LNcLgTZW0;3nY4WY;9cE@N=qZ<j;m9JxqN;HQtnnvL5O
zi3HM{(MTHR6{{5y@%q%Ph!#XNhYHfWn6b#Y=tw5+xdXD)crK;If+p0Bf^Rq^SHkzr
zv2KU?`}SqEsY`dT#IKJ_U{|WDIla|HpWBBgJ=FqTX@2w{UI%q}XXU~M1HnKr5DWwZ
z|CRx1)sXqUVc1|G7zhTw8IbQof(mBG-cUasFggMNXK<@vt+NC$i36A&dqa32Y^gv?
zWgjuv(&0}YmmPaUODEQwQO9p)pHNtDhd*gJaW)Ja3<Lw$3`}jikpBM&y)pk^C&exp
z2nPNX13arX)f!Lo-a2}m^x6d7K`(+>4TsTI4AfSPjkMzBATG%o=h?A0)O7eY9T-0X
M!b?an@EZ)A0UQ`6CjbBd

diff --git a/src/main/java/me/.DS_Store b/src/main/java/me/.DS_Store
deleted file mode 100644
index cfb2ebac72a8633754645d332a1cf29f3f06af1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOHRZv47Fj9Mq<G%Sw`XnbAxCo7obao#L)6tw4{RRzAFyK9k>tAb_UIeN);O<
zz?PhsICh)7s&Pz2yz1*E(SnHPP(hZ?h=_S~>L5EG0a>5%OqZ1CiPq5HA+q)pDygTA
z?r3-Y=NPT&o;LMM)!e4kV2e|(&BL;+Qrp?y-(II9+Ef&Ezp04cug<PDZelrYs=pc0
zJ?^ZE<x{&j1I~am;0*j{1|*?D=EsKKIs?vtGw{iPoDTsi7&8urdUT-C5&$@ZSp|K)
zU;={}fHC7>2n&QQ6lkHGOANMf*hBV<83#iPC(gwO=QnSQm+keIgSrz(LvNh{XJDU!
zLmMt6|6kyj94+$qLww{6I0Ju-0iG3QvBIWuZvC=7$+ZD`0~Ha!K{^ohH5CIj6=NXh
g$f-`+e2_loW5&Tyo+5S)2l_=o3Gv1m_yGn!0Or^~YXATM

diff --git a/src/main/java/me/SuperRonanCraft/.DS_Store b/src/main/java/me/SuperRonanCraft/.DS_Store
deleted file mode 100644
index f8ae46374e908df5f013af3c4d09c7898dce440b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!Ab-%3{7-}6)$`ASnvz>56Up!#q}nFIJ4+shAz5$FMf{y<A3-GzBEyGum|xV
zBFWIav`O0OgJ~y3#Lcc>5-o^mjwZ-rR78fWt^*4`0&<ySO^<X*S9H-oRVMn2L-Ov&
z)X<u?c=q1E8}3pXu&tVVxL>ZiG;VZ9FVFR;F|}>K+jc~+*Jn2+wzAZi`fo&S9`;v!
z(}i6-1I~am;0!neKVU#EH^}@%(X}(+3^)Uy49NKq&;+AlRxC#cR4D;~GYl7jEwzN?
z1jA^U72$!frUEsUt;AqW$9S-~XqXi>o!E*Gwv|7M7cQ$~{!qe+qoQkPz!{h_aH!pd
z-2dnJWU58}G{t+)fHUyV7~omEY8!0I?$$5cle;#c-J*#|TowZYd-4;2j+`T>#i{-v
aHsYdTR+L#}yrcvDN1zbm${F|t2HpX#Z!;eN

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 13ce59656bb7174305f726891504c2e85bc0392f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ5Iwu5S<M{3ZY3sLAggDH?S<z(59k`u=z-_<A@~GJ_kKV;y%3j2zixH83i;W
z&Aj#Q%<k-S<jD|G$hXy$XhK9IDC6J?W{>bX>y8X;W(*9n$EI4B^;6r{cy##-4Dh?V
zq-XkoE-86`z3KXOIxE{|r8mkKX;9M^MYY|OMBk6am-zHzo3=W#x_ayHJm=ssy(5_y
zDC3e!*meJhwbvm{@#gc;MoF>{eBS;8leCZcr5Cu94c#~c&VVy;<_uVo9$lY#o}QjF
z;0&Ce0scNjC}U>WDaxk<Mp^*i5Yr+Ub1%U$(J(XY6tMyc8Vc0VU@b<_aLh;Z%M3e3
z4X0quN3fHFbtpkj$No{=DP)RnodIVcW#B>|CtUyU5BL9RkUu#C&cMH7APkFHk>g5M
xTX!zUwKhWMP!{&<6n{f7kWvg^F2%P{5zI#(05ii*5i=0~BOo-maRyGxzz;e(R<-~D

diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java
index 876149b..5cd790f 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java
@@ -274,7 +274,7 @@ 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();
+        String block = world.getBlockAt(x, y, 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);
         return null;