Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-28 05:35:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix possible NPEs when calling API storage events - fixes #384

Browse Source
This commit is contained in:
Luck 2017-07-22 00:06:37 +01:00
parent 65b0d45738
commit b4aeb04d1b
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/src/main/java/me/lucko/luckperms/common/storage/AbstractStorage.java
View File

@ -139,7 +139,10 @@ public class AbstractStorage implements Storage {
public CompletableFuture<Boolean> createAndLoadGroup(String name, CreationCause cause) { public CompletableFuture<Boolean> createAndLoadGroup(String name, CreationCause cause) {
return makeFuture(() -> { return makeFuture(() -> {
if (backing.createAndLoadGroup(name)) { if (backing.createAndLoadGroup(name)) {
plugin.getApiProvider().getEventFactory().handleGroupCreate(plugin.getGroupManager().getIfLoaded(name), cause); Group g = plugin.getGroupManager().getIfLoaded(name);
if (g != null) {
plugin.getApiProvider().getEventFactory().handleGroupCreate(g, cause);
}
return true; return true;
} }
return false; return false;
@ -150,7 +153,10 @@ public class AbstractStorage implements Storage {
public CompletableFuture<Boolean> loadGroup(String name) { public CompletableFuture<Boolean> loadGroup(String name) {
return makeFuture(() -> { return makeFuture(() -> {
if (backing.loadGroup(name)) { if (backing.loadGroup(name)) {
plugin.getApiProvider().getEventFactory().handleGroupLoad(plugin.getGroupManager().getIfLoaded(name)); Group g = plugin.getGroupManager().getIfLoaded(name);
if (g != null) {
plugin.getApiProvider().getEventFactory().handleGroupLoad(g);
}
return true; return true;
} }
return false; return false;
@ -193,7 +199,10 @@ public class AbstractStorage implements Storage {
public CompletableFuture<Boolean> createAndLoadTrack(String name, CreationCause cause) { public CompletableFuture<Boolean> createAndLoadTrack(String name, CreationCause cause) {
return makeFuture(() -> { return makeFuture(() -> {
if (backing.createAndLoadTrack(name)) { if (backing.createAndLoadTrack(name)) {
plugin.getApiProvider().getEventFactory().handleTrackCreate(plugin.getTrackManager().getIfLoaded(name), cause); Track t = plugin.getTrackManager().getIfLoaded(name);
if (t != null) {
plugin.getApiProvider().getEventFactory().handleTrackCreate(t, cause);
}
return true; return true;
} }
return false; return false;
@ -204,7 +213,10 @@ public class AbstractStorage implements Storage {
public CompletableFuture<Boolean> loadTrack(String name) { public CompletableFuture<Boolean> loadTrack(String name) {
return makeFuture(() -> { return makeFuture(() -> {
if (backing.loadTrack(name)) { if (backing.loadTrack(name)) {
plugin.getApiProvider().getEventFactory().handleTrackLoad(plugin.getTrackManager().getIfLoaded(name)); Track t = plugin.getTrackManager().getIfLoaded(name);
if (t != null) {
plugin.getApiProvider().getEventFactory().handleTrackLoad(t);
}
return true; return true;
} }
return false; return false;