diff --git a/pom.xml b/pom.xml index 649f4079..706136ca 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.massivecraft Factions - 1.6.9.5-U0.2.1-2.0.2-BETA + 1.6.9.5-U0.2.1-2.0.3-BETA jar SaberFactions diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index 39e9710c..19e68985 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -161,22 +161,22 @@ public class Conf { public static boolean territoryDenyBuildWhenOffline = true; public static boolean territoryPainBuild = false; public static boolean territoryPainBuildWhenOffline = false; - public static boolean territoryDenyUseage = true; + public static boolean territoryDenyUsage = true; public static boolean territoryEnemyDenyBuild = true; public static boolean territoryEnemyDenyBuildWhenOffline = true; public static boolean territoryEnemyPainBuild = false; public static boolean territoryEnemyPainBuildWhenOffline = false; - public static boolean territoryEnemyDenyUseage = true; + public static boolean territoryEnemyDenyUsage = true; public static boolean territoryAllyDenyBuild = true; public static boolean territoryAllyDenyBuildWhenOffline = true; public static boolean territoryAllyPainBuild = false; public static boolean territoryAllyPainBuildWhenOffline = false; - public static boolean territoryAllyDenyUseage = true; + public static boolean territoryAllyDenyUsage = true; public static boolean territoryTruceDenyBuild = true; public static boolean territoryTruceDenyBuildWhenOffline = true; public static boolean territoryTrucePainBuild = false; public static boolean territoryTrucePainBuildWhenOffline = false; - public static boolean territoryTruceDenyUseage = true; + public static boolean territoryTruceDenyUsage = true; public static boolean territoryBlockCreepers = false; public static boolean territoryBlockCreepersWhenOffline = false; public static boolean territoryBlockFireballs = false; @@ -186,12 +186,12 @@ public class Conf { public static boolean territoryDenyEndermanBlocks = true; public static boolean territoryDenyEndermanBlocksWhenOffline = true; public static boolean safeZoneDenyBuild = true; - public static boolean safeZoneDenyUseage = true; + public static boolean safeZoneDenyUsage = true; public static boolean safeZoneBlockTNT = true; public static boolean safeZonePreventAllDamageToPlayers = false; public static boolean safeZoneDenyEndermanBlocks = true; public static boolean warZoneDenyBuild = true; - public static boolean warZoneDenyUseage = true; + public static boolean warZoneDenyUsage = true; public static boolean warZoneBlockCreepers = false; public static boolean warZoneBlockFireballs = false; public static boolean warZoneBlockTNT = true; @@ -199,7 +199,7 @@ public class Conf { public static boolean warZoneFriendlyFire = false; public static boolean warZoneDenyEndermanBlocks = true; public static boolean wildernessDenyBuild = false; - public static boolean wildernessDenyUseage = false; + public static boolean wildernessDenyUsage = false; public static boolean wildernessBlockCreepers = false; public static boolean wildernessBlockFireballs = false; public static boolean wildernessBlockTNT = false; @@ -217,9 +217,9 @@ public class Conf { public static boolean ownedMessageByChunk = false; public static boolean pistonProtectionThroughDenyBuild = true; public static Set territoryProtectedMaterials = EnumSet.noneOf(Material.class); - public static Set territoryDenyUseageMaterials = EnumSet.noneOf(Material.class); + public static Set territoryDenyUsageMaterials = EnumSet.noneOf(Material.class); public static Set territoryProtectedMaterialsWhenOffline = EnumSet.noneOf(Material.class); - public static Set territoryDenyUseageMaterialsWhenOffline = EnumSet.noneOf(Material.class); + public static Set territoryDenyUsageMaterialsWhenOffline = EnumSet.noneOf(Material.class); public static transient Set safeZoneNerfedCreatureTypes = EnumSet.noneOf(EntityType.class); /// /// This defines a set of materials which should always be allowed to use, regardless of factions permissions. @@ -388,25 +388,25 @@ public class Conf { // Config is not loading if value is empty ??? territoryBypassProtectedMaterials.add(Material.COOKIE); - territoryDenyUseageMaterials.add(XMaterial.FIRE_CHARGE.parseMaterial()); - territoryDenyUseageMaterials.add(Material.FLINT_AND_STEEL); - territoryDenyUseageMaterials.add(Material.BUCKET); - territoryDenyUseageMaterials.add(Material.WATER_BUCKET); - territoryDenyUseageMaterials.add(Material.LAVA_BUCKET); + territoryDenyUsageMaterials.add(XMaterial.FIRE_CHARGE.parseMaterial()); + territoryDenyUsageMaterials.add(Material.FLINT_AND_STEEL); + territoryDenyUsageMaterials.add(Material.BUCKET); + territoryDenyUsageMaterials.add(Material.WATER_BUCKET); + territoryDenyUsageMaterials.add(Material.LAVA_BUCKET); if (!FactionsPlugin.getInstance().mc17) { - territoryDenyUseageMaterials.add(Material.ARMOR_STAND); + territoryDenyUsageMaterials.add(Material.ARMOR_STAND); } territoryProtectedMaterialsWhenOffline.add(Material.BEACON); - territoryDenyUseageMaterialsWhenOffline.add(XMaterial.FIRE_CHARGE.parseMaterial()); - territoryDenyUseageMaterialsWhenOffline.add(Material.FLINT_AND_STEEL); - territoryDenyUseageMaterialsWhenOffline.add(Material.BUCKET); - territoryDenyUseageMaterialsWhenOffline.add(Material.WATER_BUCKET); - territoryDenyUseageMaterialsWhenOffline.add(Material.LAVA_BUCKET); + territoryDenyUsageMaterialsWhenOffline.add(XMaterial.FIRE_CHARGE.parseMaterial()); + territoryDenyUsageMaterialsWhenOffline.add(Material.FLINT_AND_STEEL); + territoryDenyUsageMaterialsWhenOffline.add(Material.BUCKET); + territoryDenyUsageMaterialsWhenOffline.add(Material.WATER_BUCKET); + territoryDenyUsageMaterialsWhenOffline.add(Material.LAVA_BUCKET); if (!FactionsPlugin.getInstance().mc17) { - territoryDenyUseageMaterialsWhenOffline.add(Material.ARMOR_STAND); + territoryDenyUsageMaterialsWhenOffline.add(Material.ARMOR_STAND); } safeZoneNerfedCreatureTypes.add(EntityType.BLAZE); safeZoneNerfedCreatureTypes.add(EntityType.CAVE_SPIDER); diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java index 99221986..f72d2bbd 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -262,9 +262,9 @@ public class FactionsBlockListener implements Listener { } } - @EventHandler + @EventHandler (ignoreCancelled = true) public void onHopperPlace(BlockPlaceEvent e) { - if (e.getItemInHand().getType() != Material.HOPPER && !FactionsPlugin.getInstance().getConfig().getBoolean("fvault.No-Hoppers-near-vault")) { + if (e.getItemInHand().getType() != Material.HOPPER || !FactionsPlugin.getInstance().getConfig().getBoolean("fvault.No-Hoppers-near-vault")) { return; } diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 43c02e1c..075cde0f 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -110,17 +110,17 @@ public class FactionsPlayerListener implements Listener { } if (otherFaction.hasPlayersOnline()) { - if (!Conf.territoryDenyUseageMaterials.contains(material)) { + if (!Conf.territoryDenyUsageMaterials.contains(material)) { return true; // Item isn't one we're preventing for online factions. } } else { - if (!Conf.territoryDenyUseageMaterialsWhenOffline.contains(material)) { + if (!Conf.territoryDenyUsageMaterialsWhenOffline.contains(material)) { return true; // Item isn't one we're preventing for offline factions. } } if (otherFaction.isWilderness()) { - if (!Conf.wildernessDenyUseage || Conf.worldsNoWildernessProtection.contains(location.getWorld().getName())) { + if (!Conf.wildernessDenyUsage || Conf.worldsNoWildernessProtection.contains(location.getWorld().getName())) { return true; // This is not faction territory. Use whatever you like here. } @@ -130,7 +130,7 @@ public class FactionsPlayerListener implements Listener { return false; } else if (otherFaction.isSafeZone()) { - if (!Conf.safeZoneDenyUseage || Permission.MANAGE_SAFE_ZONE.has(player)) { + if (!Conf.safeZoneDenyUsage || Permission.MANAGE_SAFE_ZONE.has(player)) { return true; } @@ -140,7 +140,7 @@ public class FactionsPlayerListener implements Listener { return false; } else if (otherFaction.isWarZone()) { - if (!Conf.warZoneDenyUseage || Permission.MANAGE_WAR_ZONE.has(player)) { + if (!Conf.warZoneDenyUsage || Permission.MANAGE_WAR_ZONE.has(player)) { return true; } diff --git a/src/main/java/com/massivecraft/factions/struct/Relation.java b/src/main/java/com/massivecraft/factions/struct/Relation.java index 7f32cb04..de812042 100644 --- a/src/main/java/com/massivecraft/factions/struct/Relation.java +++ b/src/main/java/com/massivecraft/factions/struct/Relation.java @@ -174,13 +174,13 @@ public enum Relation implements Permissable { if (isMember()) { return false; } else if (isEnemy()) { - return Conf.territoryEnemyDenyUseage; + return Conf.territoryEnemyDenyUsage; } else if (isAlly()) { - return Conf.territoryAllyDenyUseage; + return Conf.territoryAllyDenyUsage; } else if (isTruce()) { - return Conf.territoryTruceDenyUseage; + return Conf.territoryTruceDenyUsage; } else { - return Conf.territoryDenyUseage; + return Conf.territoryDenyUsage; } }