Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-02-17 20:31:34 +01:00
Code Issues Projects Releases Wiki Activity

Minor - fix merge conflicts

Browse Source
This commit is contained in:
ljacqu 2016-03-06 14:45:28 +01:00
parent 987c3fdb17
commit 3f4681c5ed
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -376,7 +376,7 @@ public class AuthMe extends JavaPlugin {
// Set up the permissions manager and command handler // Set up the permissions manager and command handler
permsMan = initializePermissionsManager(); permsMan = initializePermissionsManager();
commandHandler = initializeCommandHandler(permsMan, messages, passwordSecurity, newSettings); commandHandler = initializeCommandHandler(permsMan, messages, passwordSecurity, newSettings, ipAddressManager);
// Download and load GeoIp.dat file if absent // Download and load GeoIp.dat file if absent
GeoLiteAPI.isDataAvailable(); GeoLiteAPI.isDataAvailable();
@ -401,11 +401,12 @@ public class AuthMe extends JavaPlugin {
dataManager = new DataManager(this); 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()); management = new Management(this, processService, database, PlayerCache.getInstance());
// Set up the BungeeCord hook // Set up the BungeeCord hook
setupBungeeCordHook(); setupBungeeCordHook(newSettings, ipAddressManager);
// Reload support hook // Reload support hook
reloadSupportHook(); reloadSupportHook();