Remove use of isDataaseInitialized for MConf and EngineChat

2017-03-24 19:36:54 +01:00
parent 824ee18d53
commit 42fe618b6b
1 changed files with 8 additions and 4 deletions
--- a/src/com/massivecraft/factions/entity/MConf.java
+++ b/src/com/massivecraft/factions/entity/MConf.java
@@ -44,10 +44,14 @@ public class MConf extends Entity<MConf>
 	{
 		super.load(that);
 		
-		if (!Factions.get().isDatabaseInitialized()) return this;
-		
-		EngineChat.get().setActive(false);
-		EngineChat.get().setActive(true);
+		// Reactivate EngineChat if currently active.
+		// This way some event listeners are registered with the correct priority based on the config.
+		EngineChat engine = EngineChat.get();
+		if (engine.isActive())
+		{
+			engine.setActive(false);
+			engine.setActive(true);
+		}
 		
 		return this;
 	}