Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Group up the transient FPlayer fields.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-12 08:11:11 +02:00
parent 7693ac2010
commit 3e68c38861
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/massivecraft/factions/FPlayer.java
View File

@ -61,14 +61,9 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
}*/ }*/
// -------------------------------------------- // // -------------------------------------------- //
// FIELDS // FIELDS: RAW PERMANENT
// -------------------------------------------- // // -------------------------------------------- //
// Where did this player stand the last time we checked?
private transient PS currentChunk = null;
public PS getCurrentChunk() { return this.currentChunk; }
public void setCurrentChunk(PS currentChunk) { this.currentChunk = currentChunk.getChunk(true); }
// FIELD: factionId // FIELD: factionId
private String factionId; private String factionId;
public Faction getFaction() { if(this.factionId == null) {return null;} return FactionColl.i.get(this.factionId); } public Faction getFaction() { if(this.factionId == null) {return null;} return FactionColl.i.get(this.factionId); }
@ -109,6 +104,15 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
// FIELD: lastLoginTime // FIELD: lastLoginTime
private long lastLoginTime; private long lastLoginTime;
// -------------------------------------------- //
// FIELDS: RAW TRANSIENT
// -------------------------------------------- //
// Where did this player stand the last time we checked?
private transient PS currentChunk = null;
public PS getCurrentChunk() { return this.currentChunk; }
public void setCurrentChunk(PS currentChunk) { this.currentChunk = currentChunk.getChunk(true); }
// FIELD: mapAutoUpdating // FIELD: mapAutoUpdating
private transient boolean mapAutoUpdating; private transient boolean mapAutoUpdating;
public void setMapAutoUpdating(boolean mapAutoUpdating) { this.mapAutoUpdating = mapAutoUpdating; } public void setMapAutoUpdating(boolean mapAutoUpdating) { this.mapAutoUpdating = mapAutoUpdating; }

9
src/com/massivecraft/factions/Factions.java
View File

@ -93,7 +93,7 @@ public class Factions extends MPlugin
HerochatFeatures.setup(); HerochatFeatures.setup();
LWCFeatures.setup(); LWCFeatures.setup();
if(ConfServer.worldGuardChecking) if (ConfServer.worldGuardChecking)
{ {
Worldguard.init(this); Worldguard.init(this);
} }
@ -178,9 +178,12 @@ public class Factions extends MPlugin
this.getServer().getScheduler().cancelTask(econLandRewardTaskID); this.getServer().getScheduler().cancelTask(econLandRewardTaskID);
} }
if (ConfServer.econEnabled && if
(
ConfServer.econEnabled &&
ConfServer.econLandRewardTaskRunsEveryXMinutes > 0.0 && ConfServer.econLandRewardTaskRunsEveryXMinutes > 0.0 &&
ConfServer.econLandReward > 0.0) ConfServer.econLandReward > 0.0
)
{ {
long ticks = (long)(20 * 60 * ConfServer.econLandRewardTaskRunsEveryXMinutes); long ticks = (long)(20 * 60 * ConfServer.econLandRewardTaskRunsEveryXMinutes);
econLandRewardTaskID = getServer().getScheduler().scheduleSyncRepeatingTask(this, new EconLandRewardTask(), ticks, ticks); econLandRewardTaskID = getServer().getScheduler().scheduleSyncRepeatingTask(this, new EconLandRewardTask(), ticks, ticks);