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

Implement interface Powerboosted.

Browse Source
This commit is contained in:
ulumulu1510
2017-03-15 18:22:17 +01:00
parent 91fc5a2404
commit 9a2066efcc
10 changed files with 160 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/massivecraft/factions/entity/Faction.java
View File

@@ -17,16 +17,15 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.massivecraft.factions.EconomyParticipator;
import com.massivecraft.factions.FactionEqualsPredicate;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FactionsParticipator;
import com.massivecraft.factions.Lang;
import com.massivecraft.factions.PredicateRole;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.RelationParticipator;
import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.collections.MassiveList;
import com.massivecraft.massivecore.collections.MassiveMapDef;
import com.massivecraft.massivecore.collections.MassiveSet;
@@ -44,7 +43,7 @@ import com.massivecraft.massivecore.util.IdUtil;
import com.massivecraft.massivecore.util.MUtil;
import com.massivecraft.massivecore.util.Txt;
public class Faction extends Entity<Faction> implements EconomyParticipator, Named
public class Faction extends Entity<Faction> implements FactionsParticipator
{
// -------------------------------------------- //
// META
@@ -401,7 +400,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator, Nam
// -------------------------------------------- //
// RAW
@Override
public double getPowerBoost()
{
Double ret = this.powerBoost;
@@ -409,6 +408,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator, Nam
return ret;
}
@Override
public void setPowerBoost(Double powerBoost)
{
// Clean input
@@ -942,12 +942,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator, Nam
ret += mplayer.getPower();
}
double factionPowerMax = MConf.get().factionPowerMax;
if (factionPowerMax > 0 && ret > factionPowerMax)
{
ret = factionPowerMax;
}
ret = this.limitWithPowerMax(ret);
ret += this.getPowerBoost();
return ret;
@@ -963,17 +958,20 @@ public class Faction extends Entity<Faction> implements EconomyParticipator, Nam
ret += mplayer.getPowerMax();
}
double factionPowerMax = MConf.get().factionPowerMax;
if (factionPowerMax > 0 && ret > factionPowerMax)
{
ret = factionPowerMax;
}
ret = this.limitWithPowerMax(ret);
ret += this.getPowerBoost();
return ret;
}
private double limitWithPowerMax(double power)
{
// NOTE: 0.0 powerMax means there is no max power
double powerMax = MConf.get().factionPowerMax;
return powerMax <= 0 || power < powerMax ? power : powerMax;
}
public int getPowerRounded()
{
return (int) Math.round(this.getPower());

8
src/com/massivecraft/factions/entity/MPlayer.java
View File

@@ -10,8 +10,8 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.massivecraft.factions.EconomyParticipator;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.FactionsParticipator;
import com.massivecraft.factions.Lang;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
@@ -20,8 +20,8 @@ import com.massivecraft.factions.event.EventFactionsChunkChangeType;
import com.massivecraft.factions.event.EventFactionsChunksChange;
import com.massivecraft.factions.event.EventFactionsDisband;
import com.massivecraft.factions.event.EventFactionsMembershipChange;
import com.massivecraft.factions.event.EventFactionsRemovePlayerMillis;
import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason;
import com.massivecraft.factions.event.EventFactionsRemovePlayerMillis;
import com.massivecraft.factions.mixin.PowerMixin;
import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.massivecore.mixin.MixinSenderPs;
@@ -34,7 +34,7 @@ import com.massivecraft.massivecore.util.MUtil;
import com.massivecraft.massivecore.util.Txt;
import com.massivecraft.massivecore.xlib.gson.annotations.SerializedName;
public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipator
public class MPlayer extends SenderEntity<MPlayer> implements FactionsParticipator
{
// -------------------------------------------- //
// META
@@ -393,6 +393,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
// FIELD: powerBoost
// -------------------------------------------- //
@Override
public double getPowerBoost()
{
Double ret = this.powerBoost;
@@ -400,6 +401,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
return ret;
}
@Override
public void setPowerBoost(Double powerBoost)
{
// Clean input