SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Truces.

Browse Source 
Add chat channel functionality. Essentially the same as Allies except it's a different word.
This commit is contained in:
drtshock
2015-01-22 20:30:40 -06:00
parent a943f47abb
commit 8c2f08b694
8 changed files with 71 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/massivecraft/factions/cmd/CmdChat.java
View File

@@ -42,6 +42,8 @@ public class CmdChat extends FCommand {
modeTarget = ChatMode.ALLIANCE;
} else if (modeString.startsWith("f")) {
modeTarget = ChatMode.FACTION;
} else if (modeString.startsWith("t")) {
modeTarget = ChatMode.TRUCE;
} else {
msg(TL.COMMAND_CHAT_INVALIDMODE);
return;
@@ -54,6 +56,8 @@ public class CmdChat extends FCommand {
msg(TL.COMMAND_CHAT_MODE_PUBLIC);
} else if (fme.getChatMode() == ChatMode.ALLIANCE) {
msg(TL.COMMAND_CHAT_MODE_ALLIANCE);
} else if (fme.getChatMode() == ChatMode.TRUCE) {
msg(TL.COMMAND_CHAT_MODE_TRUCE);
} else {
msg(TL.COMMAND_CHAT_MODE_FACTION);
}

6
src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java
View File

@@ -77,10 +77,8 @@ public abstract class FRelationCommand extends FCommand {
them.msg(TL.COMMAND_RELATIONS_MUTUAL, currentRelationColor + targetRelation.getTranslation(), currentRelationColor + myFaction.getTag());
myFaction.msg(TL.COMMAND_RELATIONS_MUTUAL, currentRelationColor + targetRelation.getTranslation(), currentRelationColor + them.getTag());
}
// inform the other faction of your request
else {
} else {
// inform the other faction of your request
them.msg(TL.COMMAND_RELATIONS_PROPOSAL_1, currentRelationColor + myFaction.getTag(), targetRelation.getColor() + targetRelation.getTranslation());
them.msg(TL.COMMAND_RELATIONS_PROPOSAL_2, Conf.baseCommandAliases.get(0), targetRelation, myFaction.getTag());
myFaction.msg(TL.COMMAND_RELATIONS_PROPOSAL_SENT, currentRelationColor + them.getTag(), "" + targetRelation.getColor() + targetRelation);