Skip to content

Commit 216f95f

Browse files
authored
Merge pull request #1989 from EngineHub/feature/copper-fade-flag
Add copper-fade flag to WorldGuard
2 parents ca6e228 + fd1cb1e commit 216f95f

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ public void loadConfiguration() {
281281
disableCropGrowth = getBoolean("dynamics.disable-crop-growth", false);
282282
disableSoilDehydration = getBoolean("dynamics.disable-soil-dehydration", false);
283283
disableCoralBlockFade = getBoolean("dynamics.disable-coral-block-fade", false);
284+
disableCopperBlockFade = getBoolean("dynamics.disable-copper-block-fade", false);
284285
allowedSnowFallOver = new HashSet<>(convertLegacyBlocks(getStringList("dynamics.snow-fall-blocks", null)));
285286

286287
useRegions = getBoolean("regions.enable", true);

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,16 @@ public void onBlockFade(BlockFadeEvent event) {
697697
event.setCancelled(true);
698698
return;
699699
}
700+
} else if (Materials.isUnwaxedCopper(event.getBlock().getType())) {
701+
if (wcfg.disableCopperBlockFade) {
702+
event.setCancelled(true);
703+
return;
704+
}
705+
if (wcfg.useRegions && !StateFlag.test(WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery()
706+
.queryState(BukkitAdapter.adapt(event.getBlock().getLocation()), (RegionAssociable) null, Flags.COPPER_FADE))) {
707+
event.setCancelled(true);
708+
return;
709+
}
700710
}
701711
}
702712

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ public abstract class WorldConfiguration {
165165
public boolean disableSnowmanTrails;
166166
public boolean disableSoilDehydration;
167167
public boolean disableCoralBlockFade;
168+
public boolean disableCopperBlockFade;
168169
public Set<String> allowedSnowFallOver;
169170
public boolean regionInvinciblityRemovesMobs;
170171
public boolean regionCancelEmptyChatEvents;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/Flags.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public final class Flags {
125125
public static final StateFlag CROP_GROWTH = register(new StateFlag("crop-growth", true));
126126
public static final StateFlag SOIL_DRY = register(new StateFlag("soil-dry", true));
127127
public static final StateFlag CORAL_FADE = register(new StateFlag("coral-fade", true));
128+
public static final StateFlag COPPER_FADE = register(new StateFlag("copper-fade", true));
128129
public static final StateFlag WATER_FLOW = register(new StateFlag("water-flow", true));
129130
public static final StateFlag LAVA_FLOW = register(new StateFlag("lava-flow", true));
130131

0 commit comments

Comments
 (0)