From ff91cdfed7a00e23db46da176384820ae7072ef0 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Sat, 28 Jan 2012 05:59:10 -0600 Subject: [PATCH] Players no longer regain power while dead; no more waiting to respawn in order to regain power Also added AuthDB to softdepend list, so it has first shot at Factions commands in case it needs to cancel one --- plugin.yml | 2 +- src/com/massivecraft/factions/FPlayer.java | 5 ++++- .../factions/listeners/FactionsPlayerListener.java | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugin.yml b/plugin.yml index 5f6a478b..c1d07e7b 100644 --- a/plugin.yml +++ b/plugin.yml @@ -2,7 +2,7 @@ name: Factions version: 1.6.4_dev main: com.massivecraft.factions.P authors: [Olof Larsson, Brett Flannigan] -softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, CaptureThePoints, CombatTag] +softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag] commands: factions: description: Reference command for Factions. diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java index 8405ed2b..e430c8f1 100644 --- a/src/com/massivecraft/factions/FPlayer.java +++ b/src/com/massivecraft/factions/FPlayer.java @@ -500,7 +500,10 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator long now = System.currentTimeMillis(); long millisPassed = now - this.lastPowerUpdateTime; this.lastPowerUpdateTime = now; - + + Player thisPlayer = this.getPlayer(); + if (thisPlayer != null && thisPlayer.isDead()) return; // don't let dead players regain power until they respawn + int millisPerMinute = 60*1000; this.alterPower(millisPassed * Conf.powerPerMinute / millisPerMinute); } diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 38ef6492..6b03582a 100644 --- a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -483,6 +483,9 @@ public class FactionsPlayerListener implements Listener public void onPlayerRespawn(PlayerRespawnEvent event) { FPlayer me = FPlayers.i.get(event.getPlayer()); + + me.getPower(); // update power, so they won't have gained any while dead + Location home = me.getFaction().getHome(); if (