Skip to content

Commit 5934e49

Browse files
committed
Fix changed event for copper-fade flag
1 parent 58fbb6f commit 5934e49

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@ public void onLeavesDecay(LeavesDecayEvent event) {
470470
public void onBlockForm(BlockFormEvent event) {
471471
ConfigurationManager cfg = getConfig();
472472

473-
474473
if (cfg.activityHaltToggle) {
475474
event.setCancelled(true);
476475
return;
@@ -521,6 +520,18 @@ public void onBlockForm(BlockFormEvent event) {
521520
return;
522521
}
523522
}
523+
524+
if (Materials.isUnwaxedCopper(event.getBlock().getType())) {
525+
if (wcfg.disableCopperBlockFade) {
526+
event.setCancelled(true);
527+
return;
528+
}
529+
if (wcfg.useRegions && !StateFlag.test(WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery()
530+
.queryState(BukkitAdapter.adapt(event.getBlock().getLocation()), (RegionAssociable) null, Flags.COPPER_FADE))) {
531+
event.setCancelled(true);
532+
return;
533+
}
534+
}
524535
}
525536

526537
/*
@@ -697,16 +708,6 @@ public void onBlockFade(BlockFadeEvent event) {
697708
event.setCancelled(true);
698709
return;
699710
}
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-
}
710711
}
711712
}
712713

0 commit comments

Comments
 (0)