From 3f4681c5ed16f9ee5db690f78fa88b32587ee481 Mon Sep 17 00:00:00 2001
From: ljacqu <ljacqu@users.noreply.github.com>
Date: Sun, 6 Mar 2016 14:45:28 +0100
Subject: [PATCH] Minor - fix merge conflicts

---
 src/main/java/fr/xephi/authme/AuthMe.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 047fe099e..9a16c4655 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -376,7 +376,7 @@ public class AuthMe extends JavaPlugin {
 
         // Set up the permissions manager and command handler
         permsMan = initializePermissionsManager();
-        commandHandler = initializeCommandHandler(permsMan, messages, passwordSecurity, newSettings);
+        commandHandler = initializeCommandHandler(permsMan, messages, passwordSecurity, newSettings, ipAddressManager);
 
         // Download and load GeoIp.dat file if absent
         GeoLiteAPI.isDataAvailable();
@@ -401,11 +401,12 @@ public class AuthMe extends JavaPlugin {
 
         dataManager = new DataManager(this);
 
-        ProcessService processService = new ProcessService(newSettings, messages, this);
+        ProcessService processService = new ProcessService(newSettings, messages, this,
+            ipAddressManager, passwordSecurity);
         management = new Management(this, processService, database, PlayerCache.getInstance());
 
         // Set up the BungeeCord hook
-        setupBungeeCordHook();
+        setupBungeeCordHook(newSettings, ipAddressManager);
 
         // Reload support hook
         reloadSupportHook();