diff --git a/src/main/java/com/massivecraft/factions/missions/MissionHandler.java b/src/main/java/com/massivecraft/factions/missions/MissionHandler.java index 80a2ad0a..8476e46f 100644 --- a/src/main/java/com/massivecraft/factions/missions/MissionHandler.java +++ b/src/main/java/com/massivecraft/factions/missions/MissionHandler.java @@ -41,7 +41,7 @@ public class MissionHandler implements Listener { List missions = fPlayer.getFaction().getMissions().values().stream().filter(mission -> mission.getType().equalsIgnoreCase("kill")).collect(Collectors.toList()); for (Mission mission2 : missions) { ConfigurationSection section = plugin.getConfig().getConfigurationSection("Missions").getConfigurationSection(mission2.getName()); - if (!event.getEntityType().toString().equals(section.getConfigurationSection("Mission").getString("EntityType"))) { + if (!event.getEntityType().toString().equals(section.getConfigurationSection("Mission").getString("EntityType")) && !section.getConfigurationSection("Mission").getString("EntityType").equalsIgnoreCase("ALL")) { continue; } mission2.incrementProgress(); @@ -58,7 +58,7 @@ public class MissionHandler implements Listener { List missions = fPlayer.getFaction().getMissions().values().stream().filter(mission -> mission.getType().equalsIgnoreCase("mine")).collect(Collectors.toList()); for (Mission mission2 : missions) { ConfigurationSection section = plugin.getConfig().getConfigurationSection("Missions").getConfigurationSection(mission2.getName()); - if (!event.getBlock().getType().toString().equals(section.getConfigurationSection("Mission").getString("Material"))) { + if (!event.getBlock().getType().toString().equals(section.getConfigurationSection("Mission").getString("Material")) && !section.getConfigurationSection("Mission").getString("Material").equalsIgnoreCase("ALL")) { continue; } mission2.incrementProgress(); @@ -75,7 +75,7 @@ public class MissionHandler implements Listener { List missions = fPlayer.getFaction().getMissions().values().stream().filter(mission -> mission.getType().equalsIgnoreCase("place")).collect(Collectors.toList()); for (Mission mission2 : missions) { ConfigurationSection section = plugin.getConfig().getConfigurationSection("Missions").getConfigurationSection(mission2.getName()); - if (!event.getBlock().getType().toString().equals(section.getConfigurationSection("Mission").getString("Material"))) { + if (!event.getBlock().getType().toString().equals(section.getConfigurationSection("Mission").getString("Material")) && !section.getConfigurationSection("Mission").getString("Material").equalsIgnoreCase("ALL")) { continue; } mission2.incrementProgress(); @@ -112,7 +112,7 @@ public class MissionHandler implements Listener { List missions = fPlayer.getFaction().getMissions().values().stream().filter(mission -> mission.getType().equalsIgnoreCase("tame")).collect(Collectors.toList()); for (Mission mission2 : missions) { ConfigurationSection section = plugin.getConfig().getConfigurationSection("Missions").getConfigurationSection(mission2.getName()); - if (!event.getEntityType().toString().equals(section.getConfigurationSection("Mission").getString("EntityType"))) { + if (!event.getEntityType().toString().equals(section.getConfigurationSection("Mission").getString("EntityType")) && !section.getConfigurationSection("Mission").getString("EntityType").equalsIgnoreCase("ALL")) { continue; } mission2.incrementProgress(); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 52d8307f..7b03312b 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -779,7 +779,7 @@ Missions: Reward: Commands: ["f points add %faction% 100"] animaltaming: - Slot: 20 + Slot: 21 Material: "BONE" Name: "&f100 &cTamed Animals" Lore: