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

Rename Conf --> ConfServer.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-09 13:15:25 +02:00
parent c8870d10d4
commit 1b0c0a4b72
58 changed files with 335 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/massivecraft/factions/util/AutoLeaveTask.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.util;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Factions;
@ -10,7 +10,7 @@ public class AutoLeaveTask implements Runnable
public AutoLeaveTask()
{
this.rate = Conf.autoLeaveRoutineRunsEveryXMinutes;
this.rate = ConfServer.autoLeaveRoutineRunsEveryXMinutes;
}
public void run()
@ -18,7 +18,7 @@ public class AutoLeaveTask implements Runnable
FPlayers.i.autoLeaveOnInactivityRoutine();
// maybe setting has been changed? if so, restart task at new rate
if (this.rate != Conf.autoLeaveRoutineRunsEveryXMinutes)
if (this.rate != ConfServer.autoLeaveRoutineRunsEveryXMinutes)
Factions.get().startAutoLeaveTask(true);
}
}

6
src/com/massivecraft/factions/util/EconLandRewardTask.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.util;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Factions;
@ -10,7 +10,7 @@ public class EconLandRewardTask implements Runnable {
public EconLandRewardTask()
{
this.rate = Conf.econLandRewardTaskRunsEveryXMinutes;
this.rate = ConfServer.econLandRewardTaskRunsEveryXMinutes;
}
@Override
@ -18,7 +18,7 @@ public class EconLandRewardTask implements Runnable {
{
FactionColl.i.econLandRewardRoutine();
// maybe setting has been changed? if so, restart task at new rate
if (this.rate != Conf.econLandRewardTaskRunsEveryXMinutes)
if (this.rate != ConfServer.econLandRewardTaskRunsEveryXMinutes)
Factions.get().startEconLandRewardTask(true);
}

10
src/com/massivecraft/factions/util/HealthBarUtil.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.util;
import java.util.Map.Entry;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.zcore.util.TextUtil;
public class HealthBarUtil
@ -19,10 +19,10 @@ public class HealthBarUtil
int solidCount = (int) Math.ceil(barLength * healthQuota);
// The rest is empty
int emptyCount = (int) ((barLength - solidCount) / Conf.spoutHealthBarSolidsPerEmpty);
int emptyCount = (int) ((barLength - solidCount) / ConfServer.spoutHealthBarSolidsPerEmpty);
// Create the non-parsed bar
String ret = Conf.spoutHealthBarLeft + TextUtil.repeat(Conf.spoutHealthBarSolid, solidCount) + Conf.spoutHealthBarBetween + TextUtil.repeat(Conf.spoutHealthBarEmpty, emptyCount) + Conf.spoutHealthBarRight;
String ret = ConfServer.spoutHealthBarLeft + TextUtil.repeat(ConfServer.spoutHealthBarSolid, solidCount) + ConfServer.spoutHealthBarBetween + TextUtil.repeat(ConfServer.spoutHealthBarEmpty, emptyCount) + ConfServer.spoutHealthBarRight;
// Replace color tag
ret = ret.replace("{c}", color);
@ -35,7 +35,7 @@ public class HealthBarUtil
public static String getHealthbar(double healthQuota)
{
return getHealthbar(healthQuota, Conf.spoutHealthBarWidth);
return getHealthbar(healthQuota, ConfServer.spoutHealthBarWidth);
}
public static double fixQuota(double healthQuota)
@ -55,7 +55,7 @@ public class HealthBarUtil
{
Double currentRoof = null;
String ret = null;
for (Entry<Double, String> entry : Conf.spoutHealthBarColorUnderQuota.entrySet())
for (Entry<Double, String> entry : ConfServer.spoutHealthBarColorUnderQuota.entrySet())
{
double roof = entry.getKey();
String color = entry.getValue();

6
src/com/massivecraft/factions/util/RelationUtil.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.util;
import org.bukkit.ChatColor;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.iface.RelationParticipator;
@ -135,12 +135,12 @@ public class RelationUtil
{
if (thatFaction.getFlag(FFlag.FRIENDLYFIRE) == true)
{
return Conf.colorFriendlyFire;
return ConfServer.colorFriendlyFire;
}
if (thatFaction.getFlag(FFlag.PVP) == false)
{
return Conf.colorNoPVP;
return ConfServer.colorNoPVP;
}
}
return getRelationOfThatToMe(that, me).getColor();