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

Step 1 in many removing the universe system. Untested and lacking auto convert features.

Browse Source
This commit is contained in:
Olof Larsson
2014-09-17 13:17:33 +02:00
parent c0b7b783b2
commit 529ae45ede
99 changed files with 1789 additions and 2662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/massivecraft/factions/mixin/PowerMixin.java
View File

@ -1,12 +1,12 @@
package com.massivecraft.factions.mixin;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.MPlayer;
public interface PowerMixin
{
public double getMaxUniversal(UPlayer uplayer);
public double getMax(UPlayer uplayer);
public double getMin(UPlayer uplayer);
public double getPerHour(UPlayer uplayer);
public double getPerDeath(UPlayer uplayer);
public double getMaxUniversal(MPlayer uplayer);
public double getMax(MPlayer uplayer);
public double getMin(MPlayer uplayer);
public double getPerHour(MPlayer uplayer);
public double getPerDeath(MPlayer uplayer);
}

24
src/main/java/com/massivecraft/factions/mixin/PowerMixinDefault.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.mixin;
import com.massivecraft.factions.entity.UConf;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPlayer;
public class PowerMixinDefault implements PowerMixin
{
@ -17,33 +17,33 @@ public class PowerMixinDefault implements PowerMixin
// -------------------------------------------- //
@Override
public double getMaxUniversal(UPlayer uplayer)
public double getMaxUniversal(MPlayer mplayer)
{
return this.getMax(uplayer);
return this.getMax(mplayer);
}
@Override
public double getMax(UPlayer uplayer)
public double getMax(MPlayer mplayer)
{
return UConf.get(uplayer).powerMax + uplayer.getPowerBoost();
return MConf.get().powerMax + mplayer.getPowerBoost();
}
@Override
public double getMin(UPlayer uplayer)
public double getMin(MPlayer mplayer)
{
return UConf.get(uplayer).powerMin;
return MConf.get().powerMin;
}
@Override
public double getPerHour(UPlayer uplayer)
public double getPerHour(MPlayer mplayer)
{
return UConf.get(uplayer).powerPerHour;
return MConf.get().powerPerHour;
}
@Override
public double getPerDeath(UPlayer uplayer)
public double getPerDeath(MPlayer mplayer)
{
return UConf.get(uplayer).powerPerDeath;
return MConf.get().powerPerDeath;
}
}