diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java index 4ad1f34f..53f3dc58 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java @@ -6,9 +6,7 @@ import com.massivecraft.factions.Perm; import com.massivecraft.factions.Rel; import com.massivecraft.factions.cmd.req.ReqHasFaction; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; -import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.event.EventFactionsNameChange; import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; @@ -66,21 +64,10 @@ public class CmdFactionsName extends FactionsCommand newName = event.getNewName(); // Apply - String oldName = msenderFaction.getName(); msenderFaction.setName(newName); // Inform msenderFaction.msg("%s changed your faction name to %s", msender.describeTo(msenderFaction, true), msenderFaction.getName(msenderFaction)); - - if (!MConf.get().broadcastNameChange) return; - for (Faction faction : FactionColl.get().getAll()) - { - if (faction == msenderFaction) - { - continue; - } - faction.msg("The player %s changed their faction name from %s to %s.", msender.describeTo(faction, true), msender.getColorTo(faction)+oldName, msenderFaction.getName(faction)); - } } } diff --git a/src/main/java/com/massivecraft/factions/entity/MConf.java b/src/main/java/com/massivecraft/factions/entity/MConf.java index 07f7accf..16090b0b 100644 --- a/src/main/java/com/massivecraft/factions/entity/MConf.java +++ b/src/main/java/com/massivecraft/factions/entity/MConf.java @@ -127,12 +127,6 @@ public class MConf extends Entity public int factionNameLengthMax = 16; public boolean factionNameForceUpperCase = false; - // -------------------------------------------- // - // MESSAGES - // -------------------------------------------- // - - public boolean broadcastNameChange = false; - // -------------------------------------------- // // CLAIM LIMITS // -------------------------------------------- //