Upstream
/
WorldGuard
mirror of https://github.com/EngineHub/WorldGuard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add configurable announcement for current bypass status

This commit is contained in:
JOO200 2020-09-12 11:05:52 +02:00 committed by wizjany
parent ad000ab051
commit 136ec31f38
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java
View File

@ -281,6 +281,7 @@ public class BukkitWorldConfiguration extends YamlWorldConfiguration {
claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false);
boundedLocationFlags = getBoolean("regions.location-flags-only-inside-regions", false);
disableDefaultBypass = getBoolean("regions.disable-bypass-by-default", false);
announceBypassStatus = getBoolean("regions.announce-bypass-status", false);
maxRegionCountPerPlayer = getInt("regions.max-region-count-per-player.default", 7);
maxRegionCounts = new HashMap<>();

1
worldguard-core/src/main/java/com/sk89q/worldguard/config/WorldConfiguration.java
View File

@ -175,6 +175,7 @@ public abstract class WorldConfiguration {
public boolean breakDeniedHoppers;
public boolean useMaxPriorityAssociation;
public boolean disableDefaultBypass;
public boolean announceBypassStatus;
protected Map<String, Integer> maxRegionCounts;
/**

13
worldguard-core/src/main/java/com/sk89q/worldguard/session/Session.java
View File

@ -22,8 +22,11 @@ package com.sk89q.worldguard.session;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.format.TextColor;
import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.config.WorldConfiguration;
import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.flags.StateFlag.State;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
@ -103,8 +106,14 @@ public class Session {
lastValid = location;
lastRegionSet = set.getRegions();
disableBypass = WorldGuard.getInstance().getPlatform().getGlobalStateManager()
.get(player.getWorld()).disableDefaultBypass;
WorldConfiguration cfg = WorldGuard.getInstance().getPlatform().getGlobalStateManager().get(player.getWorld());
disableBypass = cfg.disableDefaultBypass;
if (cfg.announceBypassStatus && player.hasPermission("worldguard.region.toggle-bypass")) {
player.printInfo(TextComponent.of(
"You are " + (disableBypass ? "not" : "") + " bypassing region protection. " +
"You can toggle this with /rg bypass", TextColor.DARK_PURPLE));
}
for (Handler handler : handlers.values()) {
handler.initialize(player, location, set);