From 54ba4473a248d5f47cb36855618faa81e8dd2b54 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Sun, 18 Dec 2011 01:33:34 -0600 Subject: [PATCH] Fix for disabled "bankEnabled" setting being ignored in some cases Data is no longer stored for players with full power but not in a faction --- src/com/massivecraft/factions/FPlayer.java | 3 ++- src/com/massivecraft/factions/cmd/CmdUnclaim.java | 2 +- src/com/massivecraft/factions/cmd/CmdUnclaimall.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java index b182b7d0..6a0c24e3 100644 --- a/src/com/massivecraft/factions/FPlayer.java +++ b/src/com/massivecraft/factions/FPlayer.java @@ -771,7 +771,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; @@ -809,6 +809,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator @Override public boolean shouldBeSaved() { + if (this.getPowerRounded() == this.getPowerMaxRounded() && !this.hasFaction()) return false; return ! this.deleteMe; } diff --git a/src/com/massivecraft/factions/cmd/CmdUnclaim.java b/src/com/massivecraft/factions/cmd/CmdUnclaim.java index f643e615..7c28b237 100644 --- a/src/com/massivecraft/factions/cmd/CmdUnclaim.java +++ b/src/com/massivecraft/factions/cmd/CmdUnclaim.java @@ -106,7 +106,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 00ea10f7..4cb8ffd4 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; }