From 36cb3b7cb521e647d76d2d1212bed8ba553346a5 Mon Sep 17 00:00:00 2001 From: ysl3000 Date: Tue, 4 Feb 2020 14:53:50 +0100 Subject: [PATCH 1/4] 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*eFWrASKQKwn>n-2czN zzW@7^?9CW32L2QS7$lQqOhwD9RL4t{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 @@ org.spigotmc spigot - 1.14-R0.1-SNAPSHOT + 1.15.2-R0.1-SNAPSHOT provided 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=qZ4TsTI4AfSPjkMzBATG%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 zcmeHKOHRZv47Fj9MqtAb_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&Ezp04cug2n&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{y5-o^mjwZ-rR78fWt^*4`0&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 zcmeHKJ5Iwu5SbX>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|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; From 1e4e5dd6d0c6b89d555cbb08375d05897e6f9255 Mon Sep 17 00:00:00 2001 From: ysl3000 Date: Tue, 4 Feb 2020 15:08:56 +0100 Subject: [PATCH 2/4] Fixed Grievprevention --- pom.xml | 21 ++++++++++--------- .../SuperRonanCraft/BetterRTP/player/RTP.java | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index c9ce171..8077581 100644 --- a/pom.xml +++ b/pom.xml @@ -26,10 +26,12 @@ sk89q-repo http://maven.sk89q.com/repo/ - + + + jitpack.io + https://jitpack.io + + @@ -64,12 +66,11 @@ 6.1 provided - + \ No newline at end of file diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java index 5cd790f..2c3f566 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java @@ -4,12 +4,12 @@ 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; @@ -124,7 +124,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()) From 35f79654feaf3cfa97ba84d1fcfb2b287d42bd45 Mon Sep 17 00:00:00 2001 From: ysl3000 Date: Tue, 4 Feb 2020 15:15:02 +0100 Subject: [PATCH 3/4] readd the specifix dirs to gitignore --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 826fb1b..cec7534 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ bin/ .git/ .settings/ -.classpath -.project +.classpath/ +.project/ target .idea *.iml -BetterRTP.wiki +BetterRTP.wiki/ .DS_Store \ No newline at end of file From 92bd0678ab9e4fb5207e66f56236e38a423e029c Mon Sep 17 00:00:00 2001 From: ysl3000 Date: Tue, 4 Feb 2020 16:10:56 +0100 Subject: [PATCH 4/4] fixed returning of location --- .../java/me/SuperRonanCraft/BetterRTP/player/RTP.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java index 2c3f566..0a28194 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java @@ -13,6 +13,7 @@ import me.SuperRonanCraft.BetterRTP.references.worlds.RTPWorld; 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; @@ -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, 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; }