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

Moved the last stuff away from ConfServer.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-24 08:39:26 +02:00
parent d9a23241ec
commit 825d937c84
22 changed files with 195 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/massivecraft/factions/task/EconRewardTask.java
View File

@@ -1,10 +1,9 @@
package com.massivecraft.factions.task;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.FactionColls;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.mcore.ModuloRepeatTask;
import com.massivecraft.mcore.util.TimeUnit;
public class EconRewardTask extends ModuloRepeatTask
{
@@ -22,13 +21,13 @@ public class EconRewardTask extends ModuloRepeatTask
@Override
public long getDelayMillis()
{
return (long) (ConfServer.econLandRewardTaskRunsEveryXMinutes * TimeUnit.MILLIS_PER_MINUTE);
return MConf.get().taskEconMillis;
}
@Override
public void setDelayMillis(long delayMillis)
{
throw new RuntimeException("operation not supported");
MConf.get().taskEconMillis = delayMillis;
}
@Override

4
src/com/massivecraft/factions/task/PowerUpdateTask.java
View File

@@ -26,13 +26,13 @@ public class PowerUpdateTask extends ModuloRepeatTask
@Override
public long getDelayMillis()
{
return MConf.get().powerTaskMillis;
return MConf.get().taskPowerMillis;
}
@Override
public void setDelayMillis(long delayMillis)
{
MConf.get().powerTaskMillis = delayMillis;
MConf.get().taskPowerMillis = delayMillis;
}
@Override

15
src/com/massivecraft/factions/task/AutoLeaveTask.java → src/com/massivecraft/factions/task/RemovePlayerDataTask.java
View File

@@ -1,19 +1,18 @@
package com.massivecraft.factions.task;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.UPlayerColl;
import com.massivecraft.factions.entity.UPlayerColls;
import com.massivecraft.mcore.ModuloRepeatTask;
import com.massivecraft.mcore.util.TimeUnit;
public class AutoLeaveTask extends ModuloRepeatTask
public class RemovePlayerDataTask extends ModuloRepeatTask
{
// -------------------------------------------- //
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static AutoLeaveTask i = new AutoLeaveTask();
public static AutoLeaveTask get() { return i; }
private static RemovePlayerDataTask i = new RemovePlayerDataTask();
public static RemovePlayerDataTask get() { return i; }
// -------------------------------------------- //
// OVERRIDE: MODULO REPEAT TASK
@@ -22,13 +21,13 @@ public class AutoLeaveTask extends ModuloRepeatTask
@Override
public long getDelayMillis()
{
return (long) (ConfServer.autoLeaveRoutineRunsEveryXMinutes * TimeUnit.MILLIS_PER_MINUTE);
return MConf.get().taskAutoLeaveMillis;
}
@Override
public void setDelayMillis(long delayMillis)
{
throw new RuntimeException("operation not supported");
MConf.get().taskAutoLeaveMillis = delayMillis;
}
@Override
@@ -36,7 +35,7 @@ public class AutoLeaveTask extends ModuloRepeatTask
{
for (UPlayerColl coll : UPlayerColls.get().getColls())
{
coll.autoLeaveOnInactivityRoutine();
coll.removePlayerDataAfterInactiveDaysRoutine();
}
}