From 72da80bfa07a0570b33f9f36470b8fa734ccc385 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Thu, 18 Sep 2014 14:45:32 +0200
Subject: [PATCH] Extra related fixes.

---
 .../java/com/massivecraft/factions/entity/MPlayerColl.java   | 5 +++++
 src/main/java/com/massivecraft/factions/update/OldConf.java  | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
index a9a6906e..74d3a6b5 100644
--- a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
+++ b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
@@ -50,6 +50,11 @@ public class MPlayerColl extends SenderColl<MPlayer>
 		
 		for (MPlayer mplayer : this.getAll())
 		{
+			// This may or may not be required.
+			// Some users have been reporting a loop issue with the same player detaching over and over again.
+			// Maybe skipping ahead if the player is detached will solve the issue.
+			if (mplayer.detached()) continue;
+			
 			Long lastPlayed = Mixin.getLastPlayed(mplayer.getId());
 			if (lastPlayed == null) continue;
 			
diff --git a/src/main/java/com/massivecraft/factions/update/OldConf.java b/src/main/java/com/massivecraft/factions/update/OldConf.java
index 5adb1f0b..0853ea88 100644
--- a/src/main/java/com/massivecraft/factions/update/OldConf.java
+++ b/src/main/java/com/massivecraft/factions/update/OldConf.java
@@ -31,7 +31,6 @@ public class OldConf extends Entity<OldConf>
 		mconf.defaultFactionOpen = this.defaultFactionOpen;
 		mconf.defaultFactionFlags = this.defaultFactionFlags;
 		mconf.defaultFactionPerms = this.defaultFactionPerms;
-		mconf.broadcastNameChange = this.broadcastNameChange;
 		mconf.powerMax = this.powerMax;
 		mconf.powerMin = this.powerMin;
 		mconf.powerPerHour = this.powerPerHour;