Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hopefully fix a couple of economy integration problems

Browse Source
This commit is contained in:
Brettflan 2011-11-23 00:11:30 -06:00
parent 047a03af44
commit 101aa8cabe
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/Faction.java
View File

@ -92,7 +92,7 @@ public class Faction extends Entity implements EconomyParticipator
if ( ! Econ.getMethod().createAccount(aid)) if ( ! Econ.getMethod().createAccount(aid))
{ {
P.p.log(Level.SEVERE, "Error creating faction bank account through Register: "+aid); P.p.log(Level.SEVERE, "Error creating faction bank account through Register: "+aid);
return null; // return null;
} }
MethodAccount acc = Econ.getMethod().getAccount(aid); MethodAccount acc = Econ.getMethod().getAccount(aid);
acc.set(0); acc.set(0);

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

@ -254,11 +254,14 @@ public class Econ
if ( ! shouldBeUsed()) return; if ( ! shouldBeUsed()) return;
for (Faction faction : Factions.i.get()) for (Faction faction : Factions.i.get())
{
if (faction.money > 0)
{ {
faction.getAccount().add(faction.money); faction.getAccount().add(faction.money);
faction.money = 0; faction.money = 0;
} }
} }
}
// calculate the cost for claiming land // calculate the cost for claiming land
public static double calculateClaimCost(int ownedLand, boolean takingFromAnotherFaction) public static double calculateClaimCost(int ownedLand, boolean takingFromAnotherFaction)