diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-07-15 00:47:17 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-07-15 00:47:17 +0100 |
| commit | 1f3e52a4b9f7172b9dfd94aed15778259083339b (patch) | |
| tree | e4c76649837ecd2aaa9f1ffce83c803f35e0b8f8 | |
| parent | 0bfe1ec1de6083f07745a1a093ab730646b0f475 (diff) | |
| download | Essentials-1f3e52a4b9f7172b9dfd94aed15778259083339b.tar Essentials-1f3e52a4b9f7172b9dfd94aed15778259083339b.tar.gz Essentials-1f3e52a4b9f7172b9dfd94aed15778259083339b.tar.lz Essentials-1f3e52a4b9f7172b9dfd94aed15778259083339b.tar.xz Essentials-1f3e52a4b9f7172b9dfd94aed15778259083339b.zip | |
Better handle esschat/GM reloading during async events.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java b/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java index 23fe142b2..83dd1a846 100644 --- a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java +++ b/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java @@ -102,6 +102,13 @@ public class GroupManagerHandler implements IPermissionsHandler { return null; } - return holder.getWorldPermissions(base); + try + { + return holder.getWorldPermissions(base); + } + catch (NullPointerException ex) + { + return null; + } } } |