Skip to content

Commit d3d07a1

Browse files
committed
Improve block detection
1 parent f780a16 commit d3d07a1

1 file changed

Lines changed: 9 additions & 10 deletions

File tree

bukkit/src/main/java/dev/kitteh/factions/protection/Protection.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,21 @@ public final class Protection {
4242

4343
default -> {
4444
String materialName = material.name();
45-
if (materialName.contains("BUTTON")) {
45+
if (materialName.endsWith("BUTTON")) {
4646
yield PermissibleActions.BUTTON;
47-
} else if (materialName.contains("DOOR") || materialName.contains("GATE")) {
47+
} else if (materialName.endsWith("DOOR") || materialName.endsWith("GATE")) {
4848
yield PermissibleActions.DOOR;
4949
} else if (materialName.endsWith("_PLATE")) {
5050
yield PermissibleActions.PLATE;
51-
} else if (materialName.contains("SIGN")) {
51+
} else if (materialName.endsWith("SIGN")) {
5252
yield PermissibleActions.ITEM;
53-
} else if (materialName.contains("CAULDRON") ||
54-
materialName.contains("POTTED") ||
55-
materialName.contains("SHULKER") ||
56-
materialName.contains("ANVIL") ||
53+
} else if (materialName.endsWith("CAULDRON") ||
54+
materialName.endsWith("SHULKER_BOX") ||
55+
materialName.endsWith("ANVIL") ||
5756
materialName.startsWith("POTTED") ||
58-
materialName.contains("FURNACE") ||
59-
materialName.contains("_SHELF") ||
60-
materialName.contains("COPPER_CHEST") ||
57+
materialName.endsWith("FURNACE") ||
58+
materialName.endsWith("_SHELF") ||
59+
materialName.endsWith("COPPER_CHEST") ||
6160
FactionsPlugin.instance().conf().factions().protection().getCustomContainers().contains(material)) {
6261
yield PermissibleActions.CONTAINER;
6362
}

0 commit comments

Comments
 (0)