EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds powergain flag and worldsPowerGainDisabled config option. See #526

Browse Source
This commit is contained in:
Mark Hughes
2016-07-01 11:52:10 +10:00
committed by Olof Larsson
parent 7ee391f6b9
commit 83767dc275
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/massivecraft/factions/task/TaskPlayerPowerUpdate.java
View File

@@ -1,11 +1,16 @@
package com.massivecraft.factions.task;
import org.bukkit.entity.Player;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MFlag;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.event.EventFactionsPowerChange;
import com.massivecraft.factions.event.EventFactionsPowerChange.PowerChangeReason;
import com.massivecraft.massivecore.ModuloRepeatTask;
import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.util.MUtil;
import com.massivecraft.massivecore.util.TimeUnit;
@@ -44,6 +49,14 @@ public class TaskPlayerPowerUpdate extends ModuloRepeatTask
if (MUtil.isntPlayer(player)) continue;
if (player.isDead()) continue;
// Check the powergain flag is not disabled
Faction faction = BoardColl.get().getFactionAt(PS.valueOf(player.getLocation()));
if ( ! faction.getFlag(MFlag.getFlagPowergain())) return;
// Check power gain has not been disabled in this world
if ( ! MConf.get().worldsPowerGainEnabled.contains(player)) return;
MPlayer mplayer = MPlayer.get(player);
double newPower = mplayer.getPower() + mplayer.getPowerPerHour() * millis / TimeUnit.MILLIS_PER_HOUR;