From 25c66d2491ab6d5e15b2d97591a7902ab241ddd2 Mon Sep 17 00:00:00 2001
From: Nick Minkler <sleaker@gmail.com>
Date: Thu, 12 Sep 2013 06:42:09 -0700
Subject: [PATCH] more fixes

---
 .../milkbowl/vault/chat/plugins/Chat_rscPermissions.java | 2 +-
 .../permission/plugins/Permission_rscPermissions.java    | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java b/src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java
index c9e18d7..145b159 100644
--- a/src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java
+++ b/src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java
@@ -65,7 +65,7 @@ public class Chat_rscPermissions extends Chat {
                 if (plugin.getDescription().getName().equals("rscPermissions")) {
                     bridge.rscp = (MainPluginClass) plugin;
                     bridge.rscpAPI = bridge.rscp.API;
-                    log.info(String.format("[%s][Permission] %s hooked.", vault.getDescription().getName(), "rscPermissions"));
+                    log.info(String.format("[%s][Chat] %s hooked.", vault.getDescription().getName(), "rscPermissions"));
                 }
             }
         }
diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_rscPermissions.java b/src/net/milkbowl/vault/permission/plugins/Permission_rscPermissions.java
index 82d0102..2db8561 100644
--- a/src/net/milkbowl/vault/permission/plugins/Permission_rscPermissions.java
+++ b/src/net/milkbowl/vault/permission/plugins/Permission_rscPermissions.java
@@ -37,7 +37,14 @@ public class Permission_rscPermissions extends Permission {
         super();
         this.vault = plugin;
         Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), vault);
-        rscp = (MainPluginClass)vault.getServer().getPluginManager().getPlugin("rscPermissions");
+        if (rscp == null) {
+            Plugin perms = plugin.getServer().getPluginManager().getPlugin("rscPermissions");
+            if (perms != null && perms.isEnabled()) {
+                this.rscp = (MainPluginClass) perms;
+                rscpAPI = rscp.API;
+                plugin.getLogger().info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), "rscPermissions"));
+            }
+        }
     }
 
     private class PermissionServerListener implements Listener {