Workaround fix for half-step placement on existing half-steps not being prevented; it's caused by a CraftBukkit bug:

https://bukkit.atlassian.net/browse/BUKKIT-646

Fix for a potential NPE in FPlayer autoLeaveOnInactivityRoutine.

Added CaptureThePoints and CombatTag to our softdepend list so they can potentially cancel Factions commands.
This commit is contained in:
Brettflan
2012-01-28 03:16:25 -06:00
parent ace3853694
commit 7144da54c7
3 changed files with 26 additions and 3 deletions

View File

@@ -67,7 +67,11 @@ public class FPlayers extends PlayerEntityCollection<FPlayer>
// if player is faction leader, sort out the faction since he's going away
if (fplayer.getRole() == Rel.LEADER)
fplayer.getFaction().promoteNewLeader();
{
Faction faction = fplayer.getFaction();
if (faction != null)
fplayer.getFaction().promoteNewLeader();
}
fplayer.leave(false);
fplayer.detach();