diff --git a/BetterRTPAddons/pom.xml b/BetterRTPAddons/pom.xml index 2d8eb73..d406ce1 100644 --- a/BetterRTPAddons/pom.xml +++ b/BetterRTPAddons/pom.xml @@ -7,7 +7,7 @@ me.SuperRonanCraft BetterRTPAddons jar - 1.0 + 1.1 1.8 diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/extraEffects/ExtraEffectsEffect_Skyhigh.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/extraEffects/ExtraEffectsEffect_Skyhigh.java index a3a5e61..0069748 100644 --- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/extraEffects/ExtraEffectsEffect_Skyhigh.java +++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/extraEffects/ExtraEffectsEffect_Skyhigh.java @@ -1,6 +1,7 @@ package me.SuperRonanCraft.BetterRTPAddons.addons.extraEffects; import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_TeleportEvent; +import me.SuperRonanCraft.BetterRTP.references.worlds.WORLD_TYPE; import me.SuperRonanCraft.BetterRTPAddons.Main; import me.SuperRonanCraft.BetterRTPAddons.util.Files; import org.bukkit.Bukkit; @@ -35,6 +36,8 @@ public class ExtraEffectsEffect_Skyhigh implements ExtraEffectsEffect, Listener @EventHandler void tpEvent(RTP_TeleportEvent e) { + if (e.getWorldType() == WORLD_TYPE.NETHER) + return; e.changeLocation(e.getLocation().add(0, offset, 0)); new PlayerFalling(e.getPlayer()); } diff --git a/BetterRTPAddons/src/main/resources/plugin.yml b/BetterRTPAddons/src/main/resources/plugin.yml index 9eff143..fea070e 100644 --- a/BetterRTPAddons/src/main/resources/plugin.yml +++ b/BetterRTPAddons/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ main: me.SuperRonanCraft.BetterRTPAddons.Main -version: 1.0 +version: 1.1 api-version: '1.13' name: BetterRTPAddons depend: [BetterRTP] diff --git a/pom.xml b/pom.xml index 840bdf4..70950db 100644 --- a/pom.xml +++ b/pom.xml @@ -157,26 +157,6 @@ 7.0.3 provided - - - xyz.xenondevs - particle - 1.5.1 - - - - com.github.TechFortress - GriefPrevention - 16.15.0 - provided - - - - com.github.TownyAdvanced - Towny - 0.96.1.11 - provided - br.net.fabiozumbi12.RedProtect @@ -218,12 +198,32 @@ 4.5.0 provided - + + com.github.TownyAdvanced + Towny + 0.96.1.11 + provided + + + + com.github.TechFortress + GriefPrevention + 16.15.0 + provided + + + + + + xyz.xenondevs + particle + 1.5.1 \ No newline at end of file diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java index 203ef21..fee22a4 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdPlayer.java @@ -30,9 +30,13 @@ public class CmdPlayer implements RTPCommand, RTPCommandHelpable { else usage(sendi, label); else if (args.length >= 3) - if (Bukkit.getPlayer(args[1]) != null && Bukkit.getPlayer(args[1]).isOnline()) - getCmd().tp(Bukkit.getPlayer(args[1]), sendi, Bukkit.getWorld(args[2]).getName(), getCmd().getBiomes(args, 3, sendi), RTP_TYPE.FORCED); - else if (Bukkit.getPlayer(args[1]) != null) + if (Bukkit.getPlayer(args[1]) != null && Bukkit.getPlayer(args[1]).isOnline()) { + World world = Bukkit.getWorld(args[2]); + if (world != null) { + getCmd().tp(Bukkit.getPlayer(args[1]), sendi, world.getName(), getCmd().getBiomes(args, 3, sendi), RTP_TYPE.FORCED); + } else + BetterRTP.getInstance().getText().getNotExist(sendi, args[2]); + } else if (Bukkit.getPlayer(args[1]) != null) getCmd().playerNotOnline(sendi, args[1]); else usage(sendi, label); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java index 19ba152..a4e50d9 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java @@ -52,7 +52,7 @@ public class RTPPlayer { //Valid location? if (tpLoc != null && checkDepends(tpLoc)) { if (getPl().getEco().charge(p, pWorld)) { - settings.teleport.sendPlayer(sendi, p, tpLoc, pWorld.getPrice(), pWorld.getAttempts(), type); + settings.teleport.sendPlayer(sendi, p, tpLoc, pWorld.getPrice(), pWorld.getAttempts(), type, pWorld.getWorldtype()); } } else randomlyTeleport(sendi); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java index c505021..59bec7f 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java @@ -13,9 +13,10 @@ import com.sk89q.worldguard.protection.regions.RegionContainer; import com.sk89q.worldguard.protection.regions.RegionQuery; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.angeschossen.lands.api.integration.LandsIntegration; +import me.angeschossen.lands.api.land.Land; import me.ryanhamshire.GriefPrevention.GriefPrevention; import org.bukkit.Location; -import org.kingdoms.constants.land.Land; +//import org.kingdoms.constants.land.Land; public class RTPPluginValidation { //Safe locations depending on enabled dependencies @@ -147,8 +148,8 @@ public class RTPPluginValidation { //Safe locations depending on enabled depende boolean result = true; if (getPl().getSettings().getsDepends().isKingdomsX()) try { - Land land = Land.getLand(loc); - result = land == null || !land.isClaimed(); + //Land land = Land.getLand(loc); + //result = land == null || !land.isClaimed(); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java index 7f049e4..0598191 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java @@ -3,6 +3,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp; import io.papermc.lib.PaperLib; import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.references.customEvents.*; +import me.SuperRonanCraft.BetterRTP.references.worlds.WORLD_TYPE; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.command.CommandSender; @@ -42,7 +43,7 @@ public class RTPTeleport { // } void sendPlayer(final CommandSender sendi, final Player p, final Location location, final int price, - final int attempts, RTP_TYPE type) throws NullPointerException { + final int attempts, RTP_TYPE type, WORLD_TYPE worldType) throws NullPointerException { Location oldLoc = p.getLocation(); loadingTeleport(p, sendi); //Send loading message to player who requested List> asyncChunks = getChunks(location); //Get a list of chunks @@ -52,7 +53,7 @@ public class RTPTeleport { @Override public void run() { try { - RTP_TeleportEvent event = new RTP_TeleportEvent(p, location); + RTP_TeleportEvent event = new RTP_TeleportEvent(p, location, worldType); getPl().getServer().getPluginManager().callEvent(event); Location loc = event.getLocation(); PaperLib.teleportAsync(p, loc).thenRun(new BukkitRunnable() { //Async teleport diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java index f409d1b..7322f1c 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/customEvents/RTP_TeleportEvent.java @@ -1,5 +1,6 @@ package me.SuperRonanCraft.BetterRTP.references.customEvents; +import me.SuperRonanCraft.BetterRTP.references.worlds.WORLD_TYPE; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.Event; @@ -9,11 +10,13 @@ public class RTP_TeleportEvent extends Event { Player p; Location loc; + WORLD_TYPE worldType; private static final HandlerList handler = new HandlerList(); - public RTP_TeleportEvent(Player p, Location loc) { + public RTP_TeleportEvent(Player p, Location loc, WORLD_TYPE worldType) { this.p = p; this.loc = loc; + this.worldType = worldType; } public Player getPlayer() { @@ -36,4 +39,8 @@ public class RTP_TeleportEvent extends Event { public void changeLocation(Location loc) { this.loc = loc; } + + public WORLD_TYPE getWorldType() { + return worldType; + } }