mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2025-08-18 01:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from Craftstuebchen/master

Browse Source 
Removed .DS_Store files, added support for https://hub.spigotmc.org/s…
This commit is contained in:
SuperRonanCraft 2020-02-04 11:31:16 -05:00 committed by GitHub
commit 3399eafa04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

14
.gitignore vendored
View File

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

23
pom.xml
View File

@ -26,10 +26,12 @@
<id>sk89q-repo</id> <id>sk89q-repo</id>
<url>http://maven.sk89q.com/repo/</url> <url>http://maven.sk89q.com/repo/</url>
</repository> </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> </repositories>
<dependencies> <dependencies>
<!--Spigot API--> <!--Spigot API-->
@ -49,7 +51,7 @@
<dependency> <!-- Spigot (this includes Spigot API, Bukkit API, Craftbukkit and NMS) --> <dependency> <!-- Spigot (this includes Spigot API, Bukkit API, Craftbukkit and NMS) -->
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.14-R0.1-SNAPSHOT</version> <version>1.15.2-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -64,12 +66,11 @@
<version>6.1</version> <version>6.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </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> <scope>provided</scope>
</dependency>--> </dependency>
</dependencies> </dependencies>
</project> </project>

BIN
src/main/java/.DS_Store vendored
View File

Binary file not shown.

BIN
src/main/java/me/.DS_Store vendored
View File

Binary file not shown.

BIN
src/main/java/me/SuperRonanCraft/.DS_Store vendored
View File

Binary file not shown.

BIN
src/main/java/me/SuperRonanCraft/BetterRTP/.DS_Store vendored
View File

Binary file not shown.

12
src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java
View File

@ -4,15 +4,16 @@ import com.sk89q.worldguard.bukkit.RegionContainer;
import com.sk89q.worldguard.bukkit.WGBukkit; import com.sk89q.worldguard.bukkit.WGBukkit;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.managers.RegionManager;
import me.SuperRonanCraft.BetterRTP.Main;
import me.SuperRonanCraft.BetterRTP.references.file.FileBasics; import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
import me.SuperRonanCraft.BetterRTP.references.worlds.Custom; import me.SuperRonanCraft.BetterRTP.references.worlds.Custom;
import me.SuperRonanCraft.BetterRTP.references.worlds.Default; import me.SuperRonanCraft.BetterRTP.references.worlds.Default;
import me.SuperRonanCraft.BetterRTP.references.worlds.PlayerWorld; import me.SuperRonanCraft.BetterRTP.references.worlds.PlayerWorld;
import me.SuperRonanCraft.BetterRTP.references.worlds.RTPWorld; import me.SuperRonanCraft.BetterRTP.references.worlds.RTPWorld;
import me.SuperRonanCraft.BetterRTP.Main;
import me.ryanhamshire.GriefPrevention.GriefPrevention; import me.ryanhamshire.GriefPrevention.GriefPrevention;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.block.Block;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; 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, 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) if (sendi != p)
checkPH(sendi, p.getDisplayName(), loc, price, false, attempts); checkPH(sendi, p.getDisplayName(), loc, price, false, attempts);
if (pl.getText().getTitleSuccessChat()) 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) { 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; return null;
} }