diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java index a8b19bf..d8abbd7 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -154,7 +154,6 @@ public class GriefPrevention extends JavaPlugin public boolean config_claims_lecternReadingRequiresAccessTrust; //reading lecterns requires access trust - public ArrayList config_siege_enabledWorlds; //whether or not /siege is enabled on this server public int config_siege_doorsOpenSeconds; // how before claim is re-secured after siege win public int config_siege_cooldownEndInMinutes; public boolean config_spam_enabled; //whether or not to monitor for spam @@ -646,9 +645,9 @@ public class GriefPrevention extends JavaPlugin this.config_claims_modificationTool = Material.GOLDEN_SHOVEL; } - this.config_pvp_noCombatInPlayerLandClaims = config.getBoolean("GriefPrevention.PvP.ProtectPlayersInLandClaims.PlayerOwnedClaims", this.config_siege_enabledWorlds.size() == 0); - this.config_pvp_noCombatInAdminLandClaims = config.getBoolean("GriefPrevention.PvP.ProtectPlayersInLandClaims.AdministrativeClaims", this.config_siege_enabledWorlds.size() == 0); - this.config_pvp_noCombatInAdminSubdivisions = config.getBoolean("GriefPrevention.PvP.ProtectPlayersInLandClaims.AdministrativeSubdivisions", this.config_siege_enabledWorlds.size() == 0); + this.config_pvp_noCombatInPlayerLandClaims = config.getBoolean("GriefPrevention.PvP.ProtectPlayersInLandClaims.PlayerOwnedClaims", false); // might break stuff + this.config_pvp_noCombatInAdminLandClaims = config.getBoolean("GriefPrevention.PvP.ProtectPlayersInLandClaims.AdministrativeClaims", false); // might break stuff + this.config_pvp_noCombatInAdminSubdivisions = config.getBoolean("GriefPrevention.PvP.ProtectPlayersInLandClaims.AdministrativeSubdivisions", false); // might break stuff this.config_pvp_allowLavaNearPlayers = config.getBoolean("GriefPrevention.PvP.AllowLavaDumpingNearOtherPlayers.PvPWorlds", true); this.config_pvp_allowLavaNearPlayers_NonPvp = config.getBoolean("GriefPrevention.PvP.AllowLavaDumpingNearOtherPlayers.NonPvPWorlds", false); this.config_pvp_allowFireNearPlayers = config.getBoolean("GriefPrevention.PvP.AllowFlintAndSteelNearOtherPlayers.PvPWorlds", true); @@ -3115,12 +3114,6 @@ public class GriefPrevention extends JavaPlugin return true; } - //checks whether players siege in a world - public boolean siegeEnabledForWorld(World world) - { - return this.config_siege_enabledWorlds.contains(world); - } - //moves a player from the claim he's in to a nearby wilderness location public Location ejectPlayer(Player player) {