Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-23 18:55:25 +01:00
Code Issues Projects Releases Wiki Activity

Some bugfixes

Browse Source
This commit is contained in:
Olof Larsson 2013-04-26 08:02:32 +02:00
parent 684974b336
commit f6d601446e
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/Factions.java
View File

@ -23,6 +23,8 @@ import com.massivecraft.factions.cmd.*;
import com.massivecraft.factions.entity.Board; import com.massivecraft.factions.entity.Board;
import com.massivecraft.factions.entity.BoardColls; import com.massivecraft.factions.entity.BoardColls;
import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MPlayerColl;
import com.massivecraft.factions.entity.UConfColls;
import com.massivecraft.factions.entity.UPlayerColls; import com.massivecraft.factions.entity.UPlayerColls;
import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.entity.FactionColls;
import com.massivecraft.factions.entity.MConfColl; import com.massivecraft.factions.entity.MConfColl;
@ -109,6 +111,8 @@ public class Factions extends MPlugin
// Initialize Database // Initialize Database
this.databaseInitialized = false; this.databaseInitialized = false;
MConfColl.get().init(); MConfColl.get().init();
MPlayerColl.get().init();
UConfColls.get().init();
UPlayerColls.get().init(); UPlayerColls.get().init();
FactionColls.get().init(); FactionColls.get().init();
BoardColls.get().init(); BoardColls.get().init();

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

@ -76,7 +76,8 @@ public class CmdFactionsShow extends FCommand
for (FactionsEventChunkChangeType type : FactionsEventChunkChangeType.values()) for (FactionsEventChunkChangeType type : FactionsEventChunkChangeType.values())
{ {
Double money = uconf.econChunkCost.get(type); Double money = uconf.econChunkCost.get(type);
if (money == null) money = 0D; if (money == null) continue;
if (money == 0D) continue;
money *= landCount; money *= landCount;
String word = null; String word = null;

7
src/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java
View File

@ -31,11 +31,12 @@ public class ReqBankCommandsEnabled extends ReqAbstract
@Override @Override
public String createErrorMessage(CommandSender sender, MCommand command) public String createErrorMessage(CommandSender sender, MCommand command)
{ {
if (!UConf.get(sender).bankEnabled) UConf uconf = UConf.get(sender);
if (!uconf.bankEnabled)
{ {
return Txt.parse("<b>The Factions bank system is disabled on this server."); return Txt.parse("<b>Faction banks are disabled in the <h>%s <b>universe.", uconf.getUniverse());
} }
return Txt.parse("<b>The Factions economy features are disabled on this server."); return Txt.parse("<b>Faction economy features are disabled in the <h>%s <b>universe.", uconf.getUniverse());
} }
} }

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

@ -118,9 +118,6 @@ public class Econ
if ( ! canIControllYou(invoker, from)) return false; if ( ! canIControllYou(invoker, from)) return false;
// Is there enough money for the transaction to happen? // Is there enough money for the transaction to happen?
if (Money.get(from) < amount) if (Money.get(from) < amount)
{ {
// There was not enough money to pay // There was not enough money to pay
@ -132,12 +129,9 @@ public class Econ
} }
// Transfer money // Transfer money
if (Money.subtract(from, amount)) if (Money.subtract(from, amount))
{ {
if (Money.add(from, amount)) if (Money.add(to, amount))
{ {
if (notify) if (notify)
{ {
@ -254,7 +248,7 @@ public class Econ
} }
else else
{ {
ep.msg("<h>%s<i> lost <h>%s<i> since did %s.", You, Money.format(ep, delta), actionDescription); ep.msg("<h>%s<i> lost <h>%s<i> since did %s.", You, Money.format(ep, -delta), actionDescription);
} }
} }
return true; return true;
@ -269,7 +263,7 @@ public class Econ
} }
else else
{ {
ep.msg("<h>%s<i> can't afford <h>%s<i> to %s.", You, Money.format(ep, delta), actionDescription); ep.msg("<h>%s<i> can't afford <h>%s<i> to %s.", You, Money.format(ep, -delta), actionDescription);
} }
} }
return false; return false;

2
src/com/massivecraft/factions/listeners/FactionsListenerEcon.java
View File

@ -85,7 +85,7 @@ public class FactionsListenerEcon implements Listener
double amount = Money.get(faction); double amount = Money.get(faction);
String amountString = Money.format(faction, amount); String amountString = Money.format(faction, amount);
Econ.transferMoney(usender, faction, usender, amount, false); Econ.transferMoney(usender, faction, usender, amount, true);
usender.msg("<i>You have been given the disbanded faction's bank, totaling %s.", amountString); usender.msg("<i>You have been given the disbanded faction's bank, totaling %s.", amountString);
Factions.get().log(usender.getName() + " has been given bank holdings of "+amountString+" from disbanding "+faction.getName()+"."); Factions.get().log(usender.getName() + " has been given bank holdings of "+amountString+" from disbanding "+faction.getName()+".");