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

17
src/com/massivecraft/factions/integration/Econ.java
View File

@ -11,7 +11,6 @@ import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.util.RelationUtil;
@ -48,8 +47,6 @@ public class Econ
if ( ! ConfServer.econEnabled)
Factions.get().log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true");
oldMoneyDoTransfer();
}
public static boolean shouldBeUsed()
@ -294,20 +291,6 @@ public class Econ
{
return econ.format(amount);
}
public static void oldMoneyDoTransfer()
{
if ( ! shouldBeUsed()) return;
for (Faction faction : FactionColl.i.get())
{
if (faction.money > 0)
{
econ.depositPlayer(faction.getAccountId(), faction.money);
faction.money = 0;
}
}
}
// calculate the cost for claiming land
public static double calculateClaimCost(int ownedLand, boolean takingFromAnotherFaction)