Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-24 17:11:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix protections for copper and rooted dirt

Browse Source
This commit is contained in:
JOO200 2021-06-11 20:06:55 +02:00 committed by wizjany
parent a225d1b2d3
commit 9defab65d1
1 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
View File

@ -725,7 +725,6 @@ public final class Materials {
MATERIAL_FLAGS.put(Material.CALCITE, 0); MATERIAL_FLAGS.put(Material.CALCITE, 0);
MATERIAL_FLAGS.put(Material.TUFF, 0); MATERIAL_FLAGS.put(Material.TUFF, 0);
MATERIAL_FLAGS.put(Material.DRIPSTONE_BLOCK, 0); MATERIAL_FLAGS.put(Material.DRIPSTONE_BLOCK, 0);
// TODO: Maybe MODIFIED_ON_RIGHTT (using bonemeal)
MATERIAL_FLAGS.put(Material.ROOTED_DIRT, 0); MATERIAL_FLAGS.put(Material.ROOTED_DIRT, 0);
MATERIAL_FLAGS.put(Material.RAW_IRON_BLOCK, 0); MATERIAL_FLAGS.put(Material.RAW_IRON_BLOCK, 0);
@ -1571,7 +1570,7 @@ public static boolean isToolApplicable(Material toolMaterial, Material targetMat
case GRASS_BLOCK: case GRASS_BLOCK:
case DIRT: case DIRT:
case DIRT_PATH: case DIRT_PATH:
// case ROOTED_DIRT: // TODO: already handled by the server? case ROOTED_DIRT:
// case COARSE_DIRT: // already handled by the server... // case COARSE_DIRT: // already handled by the server...
return true; return true;
} }
@ -1582,6 +1581,8 @@ public static boolean isToolApplicable(Material toolMaterial, Material targetMat
case GOLDEN_AXE: case GOLDEN_AXE:
case DIAMOND_AXE: case DIAMOND_AXE:
case NETHERITE_AXE: case NETHERITE_AXE:
if (isWaxedCopper(targetMaterial))
return true;
switch (targetMaterial) { switch (targetMaterial) {
case OAK_LOG: case OAK_LOG:
case DARK_OAK_LOG: case DARK_OAK_LOG:
@ -1640,6 +1641,8 @@ public static boolean isToolApplicable(Material toolMaterial, Material targetMat
case WHITE_DYE: case WHITE_DYE:
case YELLOW_DYE: case YELLOW_DYE:
return Tag.SIGNS.isTagged(targetMaterial); return Tag.SIGNS.isTagged(targetMaterial);
case HONEYCOMB:
return isUnwaxedCopper(targetMaterial);
default: default:
return false; return false;
} }
@ -1648,4 +1651,50 @@ public static boolean isToolApplicable(Material toolMaterial, Material targetMat
public static boolean isFire(Material type) { public static boolean isFire(Material type) {
return type == Material.FIRE || type == Material.SOUL_FIRE; return type == Material.FIRE || type == Material.SOUL_FIRE;
} }
public static boolean isWaxedCopper(Material type) {
switch (type) {
case WAXED_COPPER_BLOCK:
case WAXED_EXPOSED_COPPER:
case WAXED_WEATHERED_COPPER:
case WAXED_OXIDIZED_COPPER:
case WAXED_CUT_COPPER:
case WAXED_EXPOSED_CUT_COPPER:
case WAXED_WEATHERED_CUT_COPPER:
case WAXED_OXIDIZED_CUT_COPPER:
case WAXED_CUT_COPPER_STAIRS:
case WAXED_EXPOSED_CUT_COPPER_STAIRS:
case WAXED_WEATHERED_CUT_COPPER_STAIRS:
case WAXED_OXIDIZED_CUT_COPPER_STAIRS:
case WAXED_CUT_COPPER_SLAB:
case WAXED_EXPOSED_CUT_COPPER_SLAB:
case WAXED_WEATHERED_CUT_COPPER_SLAB:
case WAXED_OXIDIZED_CUT_COPPER_SLAB:
return true;
}
return false;
}
public static boolean isUnwaxedCopper(Material type) {
switch (type) {
case COPPER_BLOCK:
case EXPOSED_COPPER:
case WEATHERED_COPPER:
case OXIDIZED_COPPER:
case CUT_COPPER:
case EXPOSED_CUT_COPPER:
case WEATHERED_CUT_COPPER:
case OXIDIZED_CUT_COPPER:
case CUT_COPPER_STAIRS:
case EXPOSED_CUT_COPPER_STAIRS:
case WEATHERED_CUT_COPPER_STAIRS:
case OXIDIZED_CUT_COPPER_STAIRS:
case CUT_COPPER_SLAB:
case EXPOSED_CUT_COPPER_SLAB:
case WEATHERED_CUT_COPPER_SLAB:
case OXIDIZED_CUT_COPPER_SLAB:
return true;
}
return false;
}
} }