diff options
| author | ElgarL <ElgarL@palmergames.com> | 2011-11-19 20:46:34 +0000 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2011-11-19 20:46:34 +0000 |
| commit | 317b0833ef66ac1e97c72e9bbea706eddf549f5d (patch) | |
| tree | a80e384a626766683e28909c43aa0a246b54725e /EssentialsGroupManager | |
| parent | 7b7d1f557f193599222ca90e74a967b3c7c0fe3c (diff) | |
| download | Essentials-317b0833ef66ac1e97c72e9bbea706eddf549f5d.tar Essentials-317b0833ef66ac1e97c72e9bbea706eddf549f5d.tar.gz Essentials-317b0833ef66ac1e97c72e9bbea706eddf549f5d.tar.lz Essentials-317b0833ef66ac1e97c72e9bbea706eddf549f5d.tar.xz Essentials-317b0833ef66ac1e97c72e9bbea706eddf549f5d.zip | |
Prevent Group.equals tests throwing a NullPointerException for
GlobalGroups.
Diffstat (limited to 'EssentialsGroupManager')
| -rw-r--r-- | EssentialsGroupManager/src/Changelog.txt | 4 | ||||
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java | 4 | ||||
| -rw-r--r-- | EssentialsGroupManager/src/plugin.yml | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index e9e21d407..d3d606079 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -72,4 +72,6 @@ v 1.5: - Fix for an error in checkFullUserPermission caused by players disconnecting mid perms update.
- Notification of being moved to the default group only happens if it's a demotion/promotion (not on join).
- Fixed GM holding files open and causing the time stamp to be incorrect. This caused GM to require a '/mansave force' when it shouldn't be needed.
- - Fixed a crash on reload due to bukkit not unloading plugins before reloading.
\ No newline at end of file + - Fixed a crash on reload due to bukkit not unloading plugins before reloading.
+v 1.6:
+ - Prevent Group.equals tests throwing a NullPointerException for GlobalGroups.
\ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java index 6f2fdd3b3..8ae272328 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java @@ -39,7 +39,9 @@ public abstract class DataUnit { public boolean equals(Object o) { if (o instanceof DataUnit) { DataUnit go = (DataUnit) o; - if (this.getName().equalsIgnoreCase(go.getName()) && this.dataSource.getName().equalsIgnoreCase(go.getDataSource().getName())) { + if (this.getName().equalsIgnoreCase(go.getName()) + && ((this.dataSource == null && go.getDataSource() == null) + || (this.dataSource.getName().equalsIgnoreCase(go.getDataSource().getName())))) { return true; } } diff --git a/EssentialsGroupManager/src/plugin.yml b/EssentialsGroupManager/src/plugin.yml index b5af09739..3c8657c12 100644 --- a/EssentialsGroupManager/src/plugin.yml +++ b/EssentialsGroupManager/src/plugin.yml @@ -1,5 +1,5 @@ name: GroupManager -version: "1.5 (Phoenix)" +version: "1.6 (Phoenix)" main: org.anjocaido.groupmanager.GroupManager website: http://www.anjocaido.info/ description: Provides on-the-fly system for permissions system created by Nijikokun. But all in memory, and with flat-file saving schedule. |