Merge pull request #6327 from TownyAdvanced/feature/redundant-iswilde…

…rness Remove redundant isWilderness check
TownyAdvanced · Nov 21, 2022 · 3ce2df6 · 3ce2df6
2 parents 6cdd370 + e7824a2
commit 3ce2df6
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/com/palmergames/bukkit/towny/TownySettings.java b/src/com/palmergames/bukkit/towny/TownySettings.java
@@ -1514,11 +1514,11 @@ public static boolean isSwitchMaterial(String mat) {
 	}
 
 	public static boolean isSwitchMaterial(Material material, Location location) {
-		if (!TownyAPI.getInstance().isWilderness(location)) {
-
-			TownBlock townBlock = TownyAPI.getInstance().getTownBlock(location);
+		TownBlock townBlock = TownyAPI.getInstance().getTownBlock(location);
+		
+		if (townBlock != null)
 			return townBlock.getData().getSwitchIds().contains(material);
-		} else
+		else
 			return switchUseMaterials.contains(material);
 	}
 
@@ -1534,11 +1534,11 @@ public static boolean isItemUseMaterial(String mat) {
 	}
 
 	public static boolean isItemUseMaterial(Material material, Location location) {
-		if (!TownyAPI.getInstance().isWilderness(location)) {
-
-			TownBlock townBlock = TownyAPI.getInstance().getTownBlock(location);
+		TownBlock townBlock = TownyAPI.getInstance().getTownBlock(location);
+		
+		if (townBlock != null)
 			return townBlock.getData().getItemUseIds().contains(material);
-		} else
+		else
 			return itemUseMaterials.contains(material);
 	}