remove ClaimsMode.SurvivalRequiringClaims

This commit is contained in:
destro174 2022-02-19 20:31:16 +01:00
parent e513d226b6
commit 1d9b5ed1f4
3 changed files with 4 additions and 9 deletions

View File

@ -4,6 +4,5 @@ public enum ClaimsMode
{
Survival,
Creative,
Disabled,
SurvivalRequiringClaims
Disabled
}

View File

@ -281,7 +281,7 @@ public class EntityEventHandler implements Listener
}
// No modification in the wilderness in creative mode.
if (instance.creativeRulesApply(block.getLocation()) || instance.config_claims_worldModes.get(block.getWorld()) == ClaimsMode.SurvivalRequiringClaims)
if (instance.creativeRulesApply(block.getLocation()))
{
event.setCancelled(true);
return;

View File

@ -889,10 +889,6 @@ public class GriefPrevention extends JavaPlugin
{
return ClaimsMode.Disabled;
}
else if (configSetting.equalsIgnoreCase("SurvivalRequiringClaims"))
{
return ClaimsMode.SurvivalRequiringClaims;
}
else
{
return null;
@ -3280,7 +3276,7 @@ public class GriefPrevention extends JavaPlugin
if (claim == null)
{
//no building in the wilderness in creative mode
if (this.creativeRulesApply(location) || this.config_claims_worldModes.get(location.getWorld()) == ClaimsMode.SurvivalRequiringClaims)
if (this.creativeRulesApply(location))
{
//exception: when chest claims are enabled, players who have zero land claims and are placing a chest
if (material != Material.CHEST || playerData.getClaims().size() > 0 || GriefPrevention.instance.config_claims_automaticClaimsForNewPlayersRadius == -1)
@ -3343,7 +3339,7 @@ public class GriefPrevention extends JavaPlugin
if (claim == null)
{
//no building in the wilderness in creative mode
if (this.creativeRulesApply(location) || this.config_claims_worldModes.get(location.getWorld()) == ClaimsMode.SurvivalRequiringClaims)
if (this.creativeRulesApply(location))
{
String reason = this.dataStore.getMessage(Messages.NoBuildOutsideClaims);
if (player.hasPermission("griefprevention.ignoreclaims"))