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

Moving more stuff and removing useless lwc integration config option.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-22 10:05:03 +02:00
parent b0871b0ee6
commit e901cae995
18 changed files with 67 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/massivecraft/factions/entity/FPlayer.java
View File

@ -694,8 +694,10 @@ public class FPlayer extends SenderEntity<FPlayer> implements EconomyParticipato
fplayer.msg("%s<i> left %s<i>.", this.describeTo(fplayer, true), myFaction.describeTo(fplayer));
}
if (ConfServer.logFactionLeave)
if (MConf.get().logFactionLeave)
{
Factions.get().log(this.getName()+" left the faction: "+myFaction.getTag());
}
}
this.resetFactionData();
@ -709,8 +711,10 @@ public class FPlayer extends SenderEntity<FPlayer> implements EconomyParticipato
}
myFaction.detach();
if (ConfServer.logFactionDisband)
if (MConf.get().logFactionDisband)
{
Factions.get().log("The faction "+myFaction.getTag()+" ("+myFaction.getId()+") was disbanded due to the last player ("+this.getName()+") leaving.");
}
}
}
@ -840,8 +844,10 @@ public class FPlayer extends SenderEntity<FPlayer> implements EconomyParticipato
BoardColl.get().setFactionAt(psChunk, forFaction);
SpoutFeatures.updateTerritoryDisplayLoc(psChunk);
if (ConfServer.logLandClaims)
if (MConf.get().logLandClaims)
{
Factions.get().log(this.getName()+" claimed land at ("+psChunk.getChunkX()+","+psChunk.getChunkZ()+") for the faction: "+forFaction.getTag());
}
return true;
}

2
src/com/massivecraft/factions/entity/FPlayerColl.java
View File

@ -130,7 +130,7 @@ public class FPlayerColl extends SenderColl<FPlayer>
if (fplayer.isOnline()) continue;
if (now - lastPlayed <= toleranceMillis) continue;
if (ConfServer.logFactionLeave || ConfServer.logFactionKick)
if (MConf.get().logFactionLeave || MConf.get().logFactionKick)
{
Factions.get().log("Player "+fplayer.getName()+" was auto-removed due to inactivity.");
}

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

@ -851,7 +851,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
}
// no members left and faction isn't permanent, so disband it
if (ConfServer.logFactionDisband)
if (MConf.get().logFactionDisband)
{
Factions.get().log("The faction "+this.getTag()+" ("+this.getId()+") has been disbanded since it has no members left.");
}

23
src/com/massivecraft/factions/entity/MConf.java
View File

@ -78,5 +78,28 @@ public class MConf extends Entity<MConf>
public boolean herochatAlliesMuted = false;
public Set<String> herochatAlliesWorlds = new HashSet<String>();
// -------------------------------------------- //
// LOGGING
// -------------------------------------------- //
public boolean logFactionCreate = true;
public boolean logFactionDisband = true;
public boolean logFactionJoin = true;
public boolean logFactionKick = true;
public boolean logFactionLeave = true;
public boolean logLandClaims = true;
public boolean logLandUnclaims = true;
public boolean logMoneyTransactions = true;
public boolean logPlayerCommands = true;
// -------------------------------------------- //
// EXPLOITS
// -------------------------------------------- //
public boolean handleExploitObsidianGenerators = true;
public boolean handleExploitEnderPearlClipping = true;
public boolean handleExploitInteractionSpam = true;
public boolean handleExploitTNTWaterlog = false;
}