diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java index 01626f44..802fa39c 100644 --- a/src/com/massivecraft/factions/Conf.java +++ b/src/com/massivecraft/factions/Conf.java @@ -95,7 +95,9 @@ public class Conf public static Set herochatAlliesWorlds = new HashSet(); public static String herochatAllyName = "Allies"; - + + public static boolean broadcastDescriptionChanges = false; + public static double autoLeaveAfterDaysOfInactivity = 10.0; public static double autoLeaveRoutineRunsEveryXMinutes = 5.0; public static boolean removePlayerDataWhenBanned = true; @@ -322,6 +324,8 @@ public class Conf monsters.add(EntityType.SKELETON); monsters.add(EntityType.SLIME); monsters.add(EntityType.SPIDER); + monsters.add(EntityType.WITCH); + monsters.add(EntityType.WITHER); monsters.add(EntityType.ZOMBIE); spoutHealthBarColorUnderQuota.put(1.0d, "&2"); diff --git a/src/com/massivecraft/factions/cmd/CmdDescription.java b/src/com/massivecraft/factions/cmd/CmdDescription.java index 01190f51..5e0e4d13 100644 --- a/src/com/massivecraft/factions/cmd/CmdDescription.java +++ b/src/com/massivecraft/factions/cmd/CmdDescription.java @@ -34,6 +34,12 @@ public class CmdDescription extends FCommand myFaction.setDescription(TextUtil.implode(args, " ").replaceAll("(&([a-f0-9]))", "& $2")); // since "&" color tags seem to work even through plain old FPlayer.sendMessage() for some reason, we need to break those up + if ( ! Conf.broadcastDescriptionChanges) + { + fme.msg("You have changed your faction description to:", myFaction.describeTo(fme)); + return; + } + // Broadcast the description to everyone for (FPlayer fplayer : FPlayers.i.getOnline()) {