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

Merge branch 'master' of github.com:MassiveCraft/Factions

Browse Source
This commit is contained in:
Olof Larsson
2012-01-11 23:02:33 +01:00
parent ea80f325ec 65f16b74bd
commit ea03124c31
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ public class FPlayers extends PlayerEntityCollection<FPlayer>
if ( ! Factions.i.exists(fplayer.getFactionId())) if ( ! Factions.i.exists(fplayer.getFactionId()))
{ {
p.log("Reset faction data (invalid faction) for player "+fplayer.getName()); p.log("Reset faction data (invalid faction) for player "+fplayer.getName());
fplayer.resetFactionData(); fplayer.resetFactionData(false);
} }
} }
} }
@@ -62,16 +62,15 @@ public class FPlayers extends PlayerEntityCollection<FPlayer>
{ {
if (now - fplayer.getLastLoginTime() > toleranceMillis) if (now - fplayer.getLastLoginTime() > toleranceMillis)
{ {
// TODO: This stops the memory leak crashes but does not solve the issue: MEMBERS ARE NOT KICKED!!! if (Conf.logFactionLeave || Conf.logFactionKick)
// TODO: DO SOMETHING ABOUT THIS P.p.log("Player "+fplayer.getName()+" was auto-removed due to inactivity.");
/*if (Conf.logFactionLeave || Conf.logFactionKick)
P.p.log("Player "+fplayer.getName()+" was auto-removed due to inactivity.");*/
// if player is faction leader, sort out the faction since he's going away // if player is faction leader, sort out the faction since he's going away
if (fplayer.getRole() == Rel.LEADER) if (fplayer.getRole() == Rel.LEADER)
fplayer.getFaction().promoteNewLeader(); fplayer.getFaction().promoteNewLeader();
fplayer.leave(false); fplayer.leave(false);
fplayer.detach();
} }
} }
} }

1
src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@@ -420,6 +420,7 @@ public class FactionsPlayerListener extends PlayerListener
if (badGuy.getRole() == Rel.LEADER) if (badGuy.getRole() == Rel.LEADER)
badGuy.getFaction().promoteNewLeader(); badGuy.getFaction().promoteNewLeader();
badGuy.leave(false); badGuy.leave(false);
badGuy.detach();
} }
} }
} }