diff --git a/lib/SpoutAPI.jar b/lib/SpoutAPI.jar index 3a207ec3..145198ea 100644 Binary files a/lib/SpoutAPI.jar and b/lib/SpoutAPI.jar differ diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java index b38d40fc..a236c7fd 100644 --- a/src/com/massivecraft/factions/FPlayer.java +++ b/src/com/massivecraft/factions/FPlayer.java @@ -608,7 +608,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator double cost = Econ.calculateClaimCost(ownedLand, currentFaction.isNormal()); //String costString = Econ.moneyString(cost); - if(Conf.bankFactionPaysLandCosts && this.hasFaction()) + if(Conf.bankEnabled && Conf.bankFactionPaysLandCosts && this.hasFaction()) { Faction faction = this.getFaction(); if ( ! Econ.modifyMoney(faction, -cost, "to claim this land", "for claiming this land")) return false; diff --git a/src/com/massivecraft/factions/Faction.java b/src/com/massivecraft/factions/Faction.java index 00d311c0..bea8e785 100644 --- a/src/com/massivecraft/factions/Faction.java +++ b/src/com/massivecraft/factions/Faction.java @@ -92,7 +92,7 @@ public class Faction extends Entity implements EconomyParticipator if ( ! Econ.getMethod().createAccount(aid)) { P.p.log(Level.SEVERE, "Error creating faction bank account through Register: "+aid); - return null; +// return null; } MethodAccount acc = Econ.getMethod().getAccount(aid); acc.set(0); diff --git a/src/com/massivecraft/factions/cmd/CmdDescription.java b/src/com/massivecraft/factions/cmd/CmdDescription.java index 63856f30..a80f023c 100644 --- a/src/com/massivecraft/factions/cmd/CmdDescription.java +++ b/src/com/massivecraft/factions/cmd/CmdDescription.java @@ -38,7 +38,7 @@ public class CmdDescription extends FCommand for (FPlayer fplayer : FPlayers.i.getOnline()) { fplayer.msg("%s changed their description to:", myFaction.describeTo(fplayer)); - fplayer.msg(""+myFaction.getDescription()); + fplayer.msg(""+myFaction.getDescription()); } } diff --git a/src/com/massivecraft/factions/cmd/CmdUnclaim.java b/src/com/massivecraft/factions/cmd/CmdUnclaim.java index 7594af08..1f3583c9 100644 --- a/src/com/massivecraft/factions/cmd/CmdUnclaim.java +++ b/src/com/massivecraft/factions/cmd/CmdUnclaim.java @@ -42,7 +42,7 @@ public class CmdUnclaim extends FCommand { double refund = Econ.calculateClaimRefund(myFaction.getLandRounded()); - if(Conf.bankFactionPaysLandCosts) + if(Conf.bankEnabled && Conf.bankFactionPaysLandCosts) { if ( ! Econ.modifyMoney(myFaction, refund, "to unclaim this land", "for unclaiming this land")) return; } diff --git a/src/com/massivecraft/factions/cmd/CmdUnclaimall.java b/src/com/massivecraft/factions/cmd/CmdUnclaimall.java index 49d2ea6f..c469190a 100644 --- a/src/com/massivecraft/factions/cmd/CmdUnclaimall.java +++ b/src/com/massivecraft/factions/cmd/CmdUnclaimall.java @@ -32,7 +32,7 @@ public class CmdUnclaimall extends FCommand if (Econ.shouldBeUsed()) { double refund = Econ.calculateTotalLandRefund(myFaction.getLandRounded()); - if(Conf.bankFactionPaysLandCosts) + if(Conf.bankEnabled && Conf.bankFactionPaysLandCosts) { if ( ! Econ.modifyMoney(myFaction, refund, "to unclaim all faction land", "for unclaiming all faction land")) return; } diff --git a/src/com/massivecraft/factions/cmd/FCommand.java b/src/com/massivecraft/factions/cmd/FCommand.java index bea6cf04..98c1e6a6 100644 --- a/src/com/massivecraft/factions/cmd/FCommand.java +++ b/src/com/massivecraft/factions/cmd/FCommand.java @@ -389,7 +389,7 @@ public abstract class FCommand extends MCommand

{ if ( ! Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.hasAdminMode()) return true; - if(Conf.bankFactionPaysLandCosts && fme.hasFaction()) + if(Conf.bankEnabled && Conf.bankFactionPaysCosts && fme.hasFaction()) { if ( ! Econ.modifyMoney(myFaction, -cost, toDoThis, forDoingThis)) return false; } diff --git a/src/com/massivecraft/factions/integration/Econ.java b/src/com/massivecraft/factions/integration/Econ.java index 6826d3b8..b04557ef 100644 --- a/src/com/massivecraft/factions/integration/Econ.java +++ b/src/com/massivecraft/factions/integration/Econ.java @@ -255,8 +255,11 @@ public class Econ for (Faction faction : Factions.i.get()) { - faction.getAccount().add(faction.money); - faction.money = 0; + if (faction.money > 0) + { + faction.getAccount().add(faction.money); + faction.money = 0; + } } } diff --git a/src/com/massivecraft/factions/integration/SpoutFeatures.java b/src/com/massivecraft/factions/integration/SpoutFeatures.java index 28eb91d9..f26f5c0d 100644 --- a/src/com/massivecraft/factions/integration/SpoutFeatures.java +++ b/src/com/massivecraft/factions/integration/SpoutFeatures.java @@ -194,11 +194,12 @@ public class SpoutFeatures if (viewedFaction == null) return; - SpoutPlayer sPlayer = SpoutManager.getPlayer(viewer.getPlayer()); Player pViewed = viewed.getPlayer(); - if (pViewed == null || viewer.getPlayer() == null) + Player pViewer = viewer.getPlayer(); + if (pViewed == null || pViewer == null) return; + SpoutPlayer sPlayer = SpoutManager.getPlayer(pViewer); String viewedTitle = viewed.getTitle(); Rel viewedRole = viewed.getRole();