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 a95ad7c..116a45d 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java @@ -2,6 +2,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp; import br.net.fabiozumbi12.RedProtect.Bukkit.RedProtect; import com.bekvon.bukkit.residence.Residence; +import com.bekvon.bukkit.residence.commands.set; import com.massivecraft.factions.Board; import com.massivecraft.factions.FLocation; import com.massivecraft.factions.Faction; @@ -9,11 +10,11 @@ import com.palmergames.bukkit.towny.TownyAPI; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.protection.ApplicableRegionSet; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; 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; @@ -48,6 +49,9 @@ public class RTPPluginValidation { //Safe locations depending on enabled depende RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer(); RegionQuery query = container.createQuery(); ApplicableRegionSet set = query.getApplicableRegions(BukkitAdapter.adapt(loc)); + //for (ProtectedRegion region : set.getRegions()) { + // region.getId() + //} result = set.size() == 0; } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java index 3f1580e..e61a15a 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java @@ -15,7 +15,7 @@ public class WorldDefault implements RTPWorld { private boolean useWorldborder; private int CenterX, CenterZ, maxBorderRad, minBorderRad, price; private List Biomes; - private HashMap prices = new HashMap<>(); + private final HashMap prices = new HashMap<>(); public void setup() { //Setups @@ -42,7 +42,7 @@ public class WorldDefault implements RTPWorld { if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Economy.Enabled")) { price = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getInt("Economy.Price"); if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("CustomWorlds.Enabled")) { - List> world_map = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getMapList("CustomWorlds.Worlds"); + List> world_map = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getMapList("CustomWorlds.Prices"); for (Map m : world_map) for (Map.Entry entry : m.entrySet()) { String _world = entry.getKey().toString(); diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java index c88a72b..76ffe54 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java @@ -35,7 +35,7 @@ public class WorldPlayer implements RTPWorld { setMaxRad(world.getMaxRad()); setMinRad(world.getMinRad()); if (world instanceof WorldDefault) - setPrice(((WorldDefault) world).getPrice(world.getWorld().getName())); + setPrice(((WorldDefault) world).getPrice(getWorld().getName())); else setPrice(world.getPrice()); List list = new ArrayList<>(world.getBiomes()); diff --git a/src/main/resources/economy.yml b/src/main/resources/economy.yml index d5b379b..95ee1e5 100644 --- a/src/main/resources/economy.yml +++ b/src/main/resources/economy.yml @@ -12,7 +12,7 @@ Hunger: #Make rtp'ing take up hunger to avoid exploits CustomWorlds: ## Enable custom world charging Enabled: true - Worlds: + Prices: ## PlayerWorld will be charged "5" when typing /rtp, if they do not have "betterrtp.eco.bypass" - world: 50 ## Setting the price to "0" will make the "Success.Bypass" message show