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

custom world prices fix

Browse Source
This commit is contained in:
SuperRonanCraft 2020-12-13 11:55:30 -05:00
parent 2f218707a5
commit 536218ebe1
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPluginValidation.java
View File

@ -2,6 +2,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp;
import br.net.fabiozumbi12.RedProtect.Bukkit.RedProtect; import br.net.fabiozumbi12.RedProtect.Bukkit.RedProtect;
import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.Residence;
import com.bekvon.bukkit.residence.commands.set;
import com.massivecraft.factions.Board; import com.massivecraft.factions.Board;
import com.massivecraft.factions.FLocation; import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
@ -9,11 +10,11 @@ import com.palmergames.bukkit.towny.TownyAPI;
import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.protection.ApplicableRegionSet; 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.RegionContainer;
import com.sk89q.worldguard.protection.regions.RegionQuery; import com.sk89q.worldguard.protection.regions.RegionQuery;
import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.angeschossen.lands.api.integration.LandsIntegration; import me.angeschossen.lands.api.integration.LandsIntegration;
import me.angeschossen.lands.api.land.Land;
import me.ryanhamshire.GriefPrevention.GriefPrevention; import me.ryanhamshire.GriefPrevention.GriefPrevention;
import org.bukkit.Location; import org.bukkit.Location;
@ -48,6 +49,9 @@ public class RTPPluginValidation { //Safe locations depending on enabled depende
RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer(); RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
RegionQuery query = container.createQuery(); RegionQuery query = container.createQuery();
ApplicableRegionSet set = query.getApplicableRegions(BukkitAdapter.adapt(loc)); ApplicableRegionSet set = query.getApplicableRegions(BukkitAdapter.adapt(loc));
//for (ProtectedRegion region : set.getRegions()) {
// region.getId()
//}
result = set.size() == 0; result = set.size() == 0;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

4
src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldDefault.java
View File

@ -15,7 +15,7 @@ public class WorldDefault implements RTPWorld {
private boolean useWorldborder; private boolean useWorldborder;
private int CenterX, CenterZ, maxBorderRad, minBorderRad, price; private int CenterX, CenterZ, maxBorderRad, minBorderRad, price;
private List<String> Biomes; private List<String> Biomes;
private HashMap<String, Integer> prices = new HashMap<>(); private final HashMap<String, Integer> prices = new HashMap<>();
public void setup() { public void setup() {
//Setups //Setups
@ -42,7 +42,7 @@ public class WorldDefault implements RTPWorld {
if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Economy.Enabled")) { if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("Economy.Enabled")) {
price = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getInt("Economy.Price"); price = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getInt("Economy.Price");
if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("CustomWorlds.Enabled")) { if (BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getBoolean("CustomWorlds.Enabled")) {
List<Map<?, ?>> world_map = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getMapList("CustomWorlds.Worlds"); List<Map<?, ?>> world_map = BetterRTP.getInstance().getFiles().getType(FileBasics.FILETYPE.ECO).getMapList("CustomWorlds.Prices");
for (Map<?, ?> m : world_map) for (Map<?, ?> m : world_map)
for (Map.Entry<?, ?> entry : m.entrySet()) { for (Map.Entry<?, ?> entry : m.entrySet()) {
String _world = entry.getKey().toString(); String _world = entry.getKey().toString();

2
src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/WorldPlayer.java
View File

@ -35,7 +35,7 @@ public class WorldPlayer implements RTPWorld {
setMaxRad(world.getMaxRad()); setMaxRad(world.getMaxRad());
setMinRad(world.getMinRad()); setMinRad(world.getMinRad());
if (world instanceof WorldDefault) if (world instanceof WorldDefault)
setPrice(((WorldDefault) world).getPrice(world.getWorld().getName())); setPrice(((WorldDefault) world).getPrice(getWorld().getName()));
else else
setPrice(world.getPrice()); setPrice(world.getPrice());
List<String> list = new ArrayList<>(world.getBiomes()); List<String> list = new ArrayList<>(world.getBiomes());

2
src/main/resources/economy.yml
View File

@ -12,7 +12,7 @@ Hunger: #Make rtp'ing take up hunger to avoid exploits
CustomWorlds: CustomWorlds:
## Enable custom world charging ## Enable custom world charging
Enabled: true Enabled: true
Worlds: Prices:
## PlayerWorld will be charged "5" when typing /rtp, if they do not have "betterrtp.eco.bypass" ## PlayerWorld will be charged "5" when typing /rtp, if they do not have "betterrtp.eco.bypass"
- world: 50 - world: 50
## Setting the price to "0" will make the "Success.Bypass" message show ## Setting the price to "0" will make the "Success.Bypass" message show