diff --git a/pom.xml b/pom.xml index 1bc1993..63c986b 100644 --- a/pom.xml +++ b/pom.xml @@ -358,7 +358,7 @@ com.github.WhipDevelopment CrashClaim - -75abe3b665-1 + c697d3e provided diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java index 082ee5a..606c804 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java @@ -42,7 +42,7 @@ private static void updater(Player p) { //RTP on first join private static void rtpOnFirstJoin(Player p) { if (getPl().getSettings().isRtpOnFirstJoin_Enabled() && !p.hasPlayedBefore()) - HelperRTP.tp(p, Bukkit.getConsoleSender(), Bukkit.getWorld(getPl().getSettings().getRtpOnFirstJoin_World()), null, RTP_TYPE.JOIN); //Console is sender to override delays + HelperRTP.tp(p, Bukkit.getConsoleSender(), Bukkit.getWorld(getPl().getSettings().getRtpOnFirstJoin_World()), null, RTP_TYPE.JOIN, true, true); } private static BetterRTP getPl() { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_HuskTowns.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_HuskTowns.java index 16b067f..da3874f 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_HuskTowns.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_HuskTowns.java @@ -2,22 +2,14 @@ import net.william278.husktowns.api.BukkitHuskTownsAPI; import org.bukkit.Location; -import org.bukkit.plugin.java.JavaPlugin; public class RTP_HuskTowns implements RegionPluginCheck { - - private final BukkitHuskTownsAPI huskTownsAPI; - - public RTP_HuskTowns(JavaPlugin plugin) { - this.huskTownsAPI = BukkitHuskTownsAPI.getInstance(); - } - @Override public boolean check(Location loc) { boolean result = true; if (REGIONPLUGINS.HUSKTOWNS.isEnabled()) { try { - result = !huskTownsAPI.getClaimAt(loc).isPresent(); + result = !BukkitHuskTownsAPI.getInstance().getClaimAt(loc).isPresent(); } catch (Exception e) { e.printStackTrace(); }