Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-07-03 09:54:51 +02:00
Code Issues Projects Releases Wiki Activity

Remove attachment check because it doesn't really make sense.

Browse Source
This commit is contained in:
sk89q 2014-07-28 14:45:05 -07:00
parent bf97e41697
commit 2c1d1ef0a3
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
View File

@ -76,7 +76,6 @@ public class WorldConfiguration {
/* Configuration data start */
public boolean summaryOnStart;
public boolean opPermissions;
public boolean checkAttached;
public boolean fireSpreadDisableToggle;
public boolean itemDurability;
public boolean simulateSponge;
@ -308,8 +307,6 @@ private void loadConfiguration() {
summaryOnStart = getBoolean("summary-on-start", true);
opPermissions = getBoolean("op-permissions", true);
checkAttached = getBoolean("internal.check-attached-blocks", false);
itemDurability = getBoolean("protection.item-durability", true);
removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);
disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false);

15
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
View File

@ -24,7 +24,6 @@
import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.blocks.ItemType;
import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.internal.Blocks;
import com.sk89q.worldguard.internal.Events;
import com.sk89q.worldguard.internal.cause.Causes;
import com.sk89q.worldguard.internal.event.BlockInteractEvent;
@ -142,13 +141,6 @@ public void onBlockBreak(BlockBreakEvent event) {
}
Events.fireToCancel(event, new BlockInteractEvent(event, Causes.create(event.getPlayer()), Interaction.BREAK, target));
if (wcfg.checkAttached) {
Block attachedTo = Blocks.getAttachesTo(target);
if (attachedTo != null) {
Events.fireToCancel(event, new BlockInteractEvent(event, Causes.create(event.getPlayer()), Interaction.BREAK, attachedTo));
}
}
}
/*
@ -477,13 +469,6 @@ public void onBlockPlace(BlockPlaceEvent event) {
Events.fireToCancel(event, new BlockInteractEvent(event, Causes.create(event.getPlayer()), Interaction.PLACE, target));
if (wcfg.checkAttached) {
Block attachedTo = Blocks.getAttachesTo(event.getBlockPlaced());
if (attachedTo != null) {
Events.fireToCancel(event, new BlockInteractEvent(event, Causes.create(event.getPlayer()), Interaction.BREAK, attachedTo));
}
}
if (wcfg.simulateSponge && target.getType() == Material.SPONGE) {
if (wcfg.redstoneSponges && target.isBlockIndirectlyPowered()) {
return;