From cc65c9c32ca3fe7644bb8f9389da90a7618b2f50 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Wed, 11 Sep 2013 23:56:29 -0700 Subject: [PATCH] fix NPE on startup for rscp --- src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java | 4 ++-- .../vault/permission/plugins/Permission_rscPermissions.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java b/src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java index 8f79e09..b87b4bd 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java @@ -84,12 +84,12 @@ public class Chat_rscPermissions extends Chat { @Override public String getName() { - return rscpAPI.getName(); + return "rscPermissions"; } @Override public boolean isEnabled() { - return rscpAPI.isEnabled(); + return rscpAPI != null && rscpAPI.isEnabled(); } @Override diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_rscPermissions.java b/src/net/milkbowl/vault/permission/plugins/Permission_rscPermissions.java index d2d5a87..a2cb6f7 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_rscPermissions.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_rscPermissions.java @@ -78,7 +78,7 @@ public class Permission_rscPermissions extends Permission { @Override public boolean isEnabled() { - return rscpAPI.isEnabled(); + return rscpAPI != null && rscpAPI.isEnabled(); } @Override