summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2012-04-12 03:21:38 +0100
committerElgarL <ElgarL@palmergames.com>2012-04-12 03:21:38 +0100
commit9f744beb135fb93ca0b875369c4d3bc48a20cbb8 (patch)
tree5885d95a1bcd32b0c103421e448529bb8e0babd1
parent62a297ec6d2dc417c2e8d97d5e3e9abbf15c6ed6 (diff)
downloadEssentials-9f744beb135fb93ca0b875369c4d3bc48a20cbb8.tar
Essentials-9f744beb135fb93ca0b875369c4d3bc48a20cbb8.tar.gz
Essentials-9f744beb135fb93ca0b875369c4d3bc48a20cbb8.tar.lz
Essentials-9f744beb135fb93ca0b875369c4d3bc48a20cbb8.tar.xz
Essentials-9f744beb135fb93ca0b875369c4d3bc48a20cbb8.zip
Unregister the worldsHolder as a service on a reload/shutdown instead of
the whole plugin.
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index 0bf6c47bf..648f5d1de 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -175,4 +175,5 @@ v 2.0:
- Startup errors will now lock out ALL commands other than '/manload'
- Fix 'manuadd' to use the default or selected world (via 'manselect'), if the world is not specified in the command.
- Expand GlobalGroups.yml and groups.yml to cover the VanishNoPacket plugin. Demonstrating how to negate and add nodes when using the '*' permission with inheritance.
- - Fix silly nested throw/catch statements. Errors are now correctly generated when reading yml's. \ No newline at end of file
+ - Fix silly nested throw/catch statements. Errors are now correctly generated when reading yml's.
+ - Unregister the worldsHolder as a service on a reload/shutdown instead of the whole plugin. \ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index 1177e3357..1c4011ff8 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -98,7 +98,7 @@ public class GroupManager extends JavaPlugin {
setLoaded(false);
// Un-register this service.
- this.getServer().getServicesManager().unregister(this);
+ this.getServer().getServicesManager().unregister(this.worldsHolder);
disableScheduler(); // Shutdown before we save, so it doesn't interfere.
if (worldsHolder != null) {