diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java index c5510fe6..847483b6 100644 --- a/src/com/massivecraft/factions/Factions.java +++ b/src/com/massivecraft/factions/Factions.java @@ -18,6 +18,7 @@ import com.massivecraft.factions.chat.tag.ChatTagRole; import com.massivecraft.factions.chat.tag.ChatTagRoleprefix; import com.massivecraft.factions.chat.tag.ChatTagName; import com.massivecraft.factions.chat.tag.ChatTagNameforce; +import com.massivecraft.factions.chat.tag.ChatTagRoleprefixforce; import com.massivecraft.factions.chat.tag.ChatTagTitle; import com.massivecraft.factions.cmd.*; import com.massivecraft.factions.entity.Board; @@ -156,6 +157,7 @@ public class Factions extends MPlugin ChatTagRelcolor.get().register(); ChatTagRole.get().register(); ChatTagRoleprefix.get().register(); + ChatTagRoleprefixforce.get().register(); ChatTagName.get().register(); ChatTagNameforce.get().register(); ChatTagTitle.get().register(); diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagName.java b/src/com/massivecraft/factions/chat/tag/ChatTagName.java index 27784fbf..74ba0214 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagName.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagName.java @@ -30,8 +30,10 @@ public class ChatTagName extends ChatTagAbstract // Get entities UPlayer usender = UPlayer.get(sender); + // No "force" Faction faction = usender.getFaction(); if (faction.isNone()) return ""; + return faction.getName(); } diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java index fbec3aad..37771450 100644 --- a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefix.java @@ -3,6 +3,7 @@ package com.massivecraft.factions.chat.tag; import org.bukkit.command.CommandSender; import com.massivecraft.factions.chat.ChatTagAbstract; +import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.UConf; import com.massivecraft.factions.entity.UPlayer; @@ -29,6 +30,10 @@ public class ChatTagRoleprefix extends ChatTagAbstract // Get entities UPlayer usender = UPlayer.get(sender); + // No "force" + Faction faction = usender.getFaction(); + if (faction.isNone()) return ""; + return usender.getRole().getPrefix(); } diff --git a/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java new file mode 100644 index 00000000..d408a999 --- /dev/null +++ b/src/com/massivecraft/factions/chat/tag/ChatTagRoleprefixforce.java @@ -0,0 +1,35 @@ +package com.massivecraft.factions.chat.tag; + +import org.bukkit.command.CommandSender; + +import com.massivecraft.factions.chat.ChatTagAbstract; +import com.massivecraft.factions.entity.UConf; +import com.massivecraft.factions.entity.UPlayer; + +public class ChatTagRoleprefixforce extends ChatTagAbstract +{ + // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // + + private ChatTagRoleprefixforce() { super("factions_roleprefix"); } + private static ChatTagRoleprefixforce i = new ChatTagRoleprefixforce(); + public static ChatTagRoleprefixforce get() { return i; } + + // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // + + @Override + public String getReplacement(CommandSender sender, CommandSender recipient) + { + // Check disabled + if (UConf.isDisabled(sender)) return ""; + + // Get entities + UPlayer usender = UPlayer.get(sender); + + return usender.getRole().getPrefix(); + } + +}