Skip to content

Commit 81964dc

Browse files
committed
fix potential NPE
1 parent 8fc02cb commit 81964dc

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/main/java/me/hsgamer/bettergui/argument/type/PlayerArgumentProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected Optional<OfflinePlayer> getObject(String name) {
2929
return Optional.ofNullable(Bukkit.getPlayer(name));
3030
} else {
3131
//noinspection deprecation
32-
return Optional.ofNullable(Bukkit.getOfflinePlayer(name));
32+
return Optional.of(Bukkit.getOfflinePlayer(name));
3333
}
3434
}
3535

src/main/java/me/hsgamer/bettergui/menu/BaseInventoryMenu.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ protected void onClose(InventoryCloseEvent event) {
308308
SchedulerUtil.async().run(batchRunnable);
309309
}
310310

311-
if (!closeRequirementApplier.isEmpty()) {
311+
if (closeRequirementApplier != null && !closeRequirementApplier.isEmpty()) {
312312
if (forceClose.contains(uuid)) {
313313
forceClose.remove(uuid);
314314
return;

src/main/java/me/hsgamer/bettergui/menu/BaseMenu.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public boolean create(Player player, String[] args, boolean bypass) {
116116
}
117117

118118
// Check Requirement
119-
if (!bypass) {
119+
if (!bypass && viewRequirementApplier != null && !viewRequirementApplier.isEmpty()) {
120120
Requirement.Result result = viewRequirementApplier.getResult(uuid);
121121

122122
BatchRunnable batchRunnable = new BatchRunnable();

0 commit comments

Comments
 (0)