minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-17 20:11:21 +02:00
Code Issues Releases Wiki Activity

Fix exception when getting displayname

Browse Source 
Fix exception if null values are in settings groups.yml
This commit is contained in:
ementalo
2012-01-25 01:09:32 +00:00
parent df061749dd
commit cbee61093e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/settings/Chat.java
View File

@@ -17,7 +17,7 @@ public class Chat implements StorageObject
"Disable this if you have any other plugin, that modifies the displayname of a user.", "Disable this if you have any other plugin, that modifies the displayname of a user.",
"If it is not set, it will be enabled if EssentialsChat is installed, otherwise not." "If it is not set, it will be enabled if EssentialsChat is installed, otherwise not."
}) })
private Boolean changeDisplayname; private Boolean changeDisplayname = true;
private String displaynameFormat = "{PREFIX}{NICKNAMEPREFIX}{NAME}{SUFFIX}"; private String displaynameFormat = "{PREFIX}{NICKNAMEPREFIX}{NAME}{SUFFIX}";
@Comment( @Comment(
{ {

3
Essentials/src/com/earth2me/essentials/settings/GroupsHolder.java
View File

@@ -58,10 +58,13 @@ public class GroupsHolder extends AsyncStorageObjectHolder<Groups> implements IG
for (Entry<String, GroupOptions> entry : groups.entrySet()) for (Entry<String, GroupOptions> entry : groups.entrySet())
{ {
if (player.isAuthorized("essentials.groups." + entry.getKey())) if (player.isAuthorized("essentials.groups." + entry.getKey()))
{
if(entry.getValue() != null)
{ {
list.add(entry.getValue()); list.add(entry.getValue());
} }
} }
}
return list; return list;
} }
finally finally