Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This option should always be disabled. Will only result in extensive trolling.

Browse Source
This commit is contained in:
Olof Larsson 2014-09-18 14:29:19 +02:00
parent aa350da005
commit b65d76f4e9
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/massivecraft/factions/cmd/CmdFactionsName.java
View File

@ -6,9 +6,7 @@ import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel; import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.req.ReqHasFaction; import com.massivecraft.factions.cmd.req.ReqHasFaction;
import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast; import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.event.EventFactionsNameChange; import com.massivecraft.factions.event.EventFactionsNameChange;
import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqHasPerm;
@ -66,21 +64,10 @@ public class CmdFactionsName extends FactionsCommand
newName = event.getNewName(); newName = event.getNewName();
// Apply // Apply
String oldName = msenderFaction.getName();
msenderFaction.setName(newName); msenderFaction.setName(newName);
// Inform // Inform
msenderFaction.msg("%s<i> changed your faction name to %s", msender.describeTo(msenderFaction, true), msenderFaction.getName(msenderFaction)); msenderFaction.msg("%s<i> 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("<i>The player %s<i> changed their faction name from %s<i> to %s<i>.", msender.describeTo(faction, true), msender.getColorTo(faction)+oldName, msenderFaction.getName(faction));
}
} }
} }

6
src/main/java/com/massivecraft/factions/entity/MConf.java
View File

@ -127,12 +127,6 @@ public class MConf extends Entity<MConf>
public int factionNameLengthMax = 16; public int factionNameLengthMax = 16;
public boolean factionNameForceUpperCase = false; public boolean factionNameForceUpperCase = false;
// -------------------------------------------- //
// MESSAGES
// -------------------------------------------- //
public boolean broadcastNameChange = false;
// -------------------------------------------- // // -------------------------------------------- //
// CLAIM LIMITS // CLAIM LIMITS
// -------------------------------------------- // // -------------------------------------------- //