mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-09-12 05:08:48 +00:00
Prevent Group.equals tests throwing a NullPointerException for
GlobalGroups.
This commit is contained in:
parent
7b7d1f557f
commit
317b0833ef
|
@ -73,3 +73,5 @@ v 1.5:
|
||||||
- Notification of being moved to the default group only happens if it's a demotion/promotion (not on join).
|
- 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 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.
|
- 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.
|
|
@ -39,7 +39,9 @@ public abstract class DataUnit {
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (o instanceof DataUnit) {
|
if (o instanceof DataUnit) {
|
||||||
DataUnit go = (DataUnit) o;
|
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;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
name: GroupManager
|
name: GroupManager
|
||||||
version: "1.5 (Phoenix)"
|
version: "1.6 (Phoenix)"
|
||||||
main: org.anjocaido.groupmanager.GroupManager
|
main: org.anjocaido.groupmanager.GroupManager
|
||||||
website: http://www.anjocaido.info/
|
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.
|
description: Provides on-the-fly system for permissions system created by Nijikokun. But all in memory, and with flat-file saving schedule.
|
||||||
|
|
Loading…
Reference in a new issue