projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-17 00:06:00 -05:00
Code Issues Projects Releases Wiki Activity

Less exceptions when shutting down the server #251

Browse Source 
Problem is the CharacterLookupService in AUTHORITY is set to null when the server's shutting down.
When this happens, null pointers occur when looking up players.
This commit is contained in:
Ziggy
2020-07-13 02:57:38 +02:00
parent bfac74bfe6
commit 81885d0849
1 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/com/projectswg/holocore/services/support/global/zone/CharacterLookupService.java
View File

@@ -143,25 +143,59 @@ public class CharacterLookupService extends Service {
return getCharacterByFirstName(name) != null;
}
@Nullable
public static Player getPlayerByFullName(String name) {
return AUTHORITY.get().getPlayerByFullName(name);
CharacterLookupService characterLookupService = AUTHORITY.get();
if (characterLookupService == null) {
return null;
}
return characterLookupService.getPlayerByFullName(name);
}
@Nullable
public static Player getPlayerByFirstName(String name) {
return AUTHORITY.get().getPlayerByFirstName(name);
CharacterLookupService characterLookupService = AUTHORITY.get();
if (characterLookupService == null) {
return null;
}
return characterLookupService.getPlayerByFirstName(name);
}
@Nullable
public static CreatureObject getCharacterByFullName(String name) {
return AUTHORITY.get().getCharacterByFullName(name);
CharacterLookupService characterLookupService = AUTHORITY.get();
if (characterLookupService == null) {
return null;
}
return characterLookupService.getCharacterByFullName(name);
}
@Nullable
public static CreatureObject getCharacterByFirstName(String name) {
return AUTHORITY.get().getCharacterByFirstName(name);
CharacterLookupService characterLookupService = AUTHORITY.get();
if (characterLookupService == null) {
return null;
}
return characterLookupService.getCharacterByFirstName(name);
}
@Nullable
public static Collection<CreatureObject> getLoggedInCharacters() {
return AUTHORITY.get().getLoggedInCharacters();
CharacterLookupService characterLookupService = AUTHORITY.get();
if (characterLookupService == null) {
return null;
}
return characterLookupService.getLoggedInCharacters();
}
}