EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Messing arund a bit with defaults

Browse Source
This commit is contained in:
Olof Larsson
2013-04-23 14:00:18 +02:00
parent f8c3c6a911
commit f802307056
8 changed files with 62 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/cmd/CmdFactionsCreate.java
View File

@@ -34,7 +34,7 @@ public class CmdFactionsCreate extends FCommand
String newTag = this.arg(0);
// Verify
if (fme.hasFaction())
if (fme.getFaction().isNormal())
{
msg("<b>You must leave your current faction first.");
return;

5
src/com/massivecraft/factions/cmd/CmdFactionsJoin.java
View File

@@ -33,6 +33,7 @@ public class CmdFactionsJoin extends FCommand
UPlayer uplayer = this.arg(1, ARUPlayer.getStartAny(sender), fme);
if (uplayer == null) return;
Faction uplayerFaction = uplayer.getFaction();
boolean samePlayer = uplayer == fme;
@@ -43,7 +44,7 @@ public class CmdFactionsJoin extends FCommand
return;
}
if (faction == uplayer.getFaction())
if (faction == uplayerFaction)
{
msg("<b>%s %s already a member of %s", uplayer.describeTo(fme, true), (samePlayer ? "are" : "is"), faction.getTag(fme));
return;
@@ -55,7 +56,7 @@ public class CmdFactionsJoin extends FCommand
return;
}
if (uplayer.hasFaction())
if (uplayerFaction.isNormal())
{
msg("<b>%s must leave %s current faction first.", uplayer.describeTo(fme, true), (samePlayer ? "your" : "their"));
return;