From f0ad32bc374c97046fd650d4b6dffbeecc587bb4 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Tue, 22 Nov 2016 21:57:51 +0000
Subject: [PATCH] Change PermissionService handling

---
 .../main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java
index dcdb1701d..9960788dc 100644
--- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java
+++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java
@@ -210,13 +210,14 @@ public class LPSpongePlugin implements LuckPermsPlugin {
 
         // register the PermissionService with Sponge
         getLog().info("Registering PermissionService...");
+        service = new LuckPermsService(this);
 
         if (game.getPluginManager().getPlugin("permissionsex").isPresent()) {
             getLog().warn("Detected PermissionsEx - assuming it's loaded for migration.");
             getLog().warn("Delaying LuckPerms PermissionService registration.");
             lateLoad = true;
         } else {
-            game.getServiceManager().setProvider(this, PermissionService.class, (service = new LuckPermsService(this)));
+            game.getServiceManager().setProvider(this, PermissionService.class, service);
         }
 
         // register with the LP API
@@ -246,7 +247,7 @@ public class LPSpongePlugin implements LuckPermsPlugin {
     public void onLateEnable(GamePreInitializationEvent event) {
         if (lateLoad) {
             getLog().info("Providing late registration of PermissionService...");
-            game.getServiceManager().setProvider(this, PermissionService.class, (service = new LuckPermsService(this)));
+            game.getServiceManager().setProvider(this, PermissionService.class, service);
         }
     }