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

rename getOpen --> isOpen and remove old money migration code.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-11 11:44:55 +02:00
parent bdd71fa86e
commit e45592432a
6 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ public class CmdFactionsJoin extends FCommand
return;
}
if( ! (faction.getOpen() || faction.isInvited(fplayer) || fme.hasAdminMode() || Perm.JOIN_ANY.has(sender, false)))
if( ! (faction.isOpen() || faction.isInvited(fplayer) || fme.hasAdminMode() || Perm.JOIN_ANY.has(sender, false)))
{
msg("<i>This faction requires invitation.");
if (samePlayer)

4
src/com/massivecraft/factions/cmd/CmdFactionsOpen.java
View File

@ -30,9 +30,9 @@ public class CmdFactionsOpen extends FCommand
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if ( ! payForCommand(ConfServer.econCostOpen, "to open or close the faction", "for opening or closing the faction")) return;
myFaction.setOpen(this.argAsBool(0, ! myFaction.getOpen()));
myFaction.setOpen(this.argAsBool(0, ! myFaction.isOpen()));
String open = myFaction.getOpen() ? "open" : "closed";
String open = myFaction.isOpen() ? "open" : "closed";
// Inform
myFaction.msg("%s<i> changed the faction to <h>%s<i>.", fme.describeTo(myFaction, true), open);

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

@ -66,7 +66,7 @@ public class CmdFactionsShow extends FCommand
msg("<a>This faction is peaceful - in truce with everyone.");
}
msg("<a>Joining: <i>"+(faction.getOpen() ? "no invitation is needed" : "invitation is required"));
msg("<a>Joining: <i>"+(faction.isOpen() ? "no invitation is needed" : "invitation is required"));
double powerBoost = faction.getPowerBoost();
String boost = (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? " (bonus: " : " (penalty: ") + powerBoost + ")";