Skip to content

Commit 77f3ecd

Browse files
committed
check empty instead of null
1 parent 81964dc commit 77f3ecd

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

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 != null && !closeRequirementApplier.isEmpty()) {
311+
if (!closeRequirementApplier.isEmpty()) {
312312
if (forceClose.contains(uuid)) {
313313
forceClose.remove(uuid);
314314
return;

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import me.hsgamer.hscore.task.BatchRunnable;
2121
import org.bukkit.entity.Player;
2222
import org.bukkit.permissions.Permission;
23-
import org.jetbrains.annotations.Nullable;
2423

2524
import java.util.Collections;
2625
import java.util.List;
@@ -44,8 +43,8 @@
4443
public abstract class BaseMenu extends StandardMenu {
4544
protected final ActionApplier openActionApplier;
4645
protected final ActionApplier closeActionApplier;
47-
protected final @Nullable RequirementApplier viewRequirementApplier;
48-
protected final @Nullable RequirementApplier closeRequirementApplier;
46+
protected final RequirementApplier viewRequirementApplier;
47+
protected final RequirementApplier closeRequirementApplier;
4948
protected final List<Permission> permissions;
5049
protected final ArgumentHandler argumentHandler;
5150

@@ -116,7 +115,7 @@ public boolean create(Player player, String[] args, boolean bypass) {
116115
}
117116

118117
// Check Requirement
119-
if (!bypass && viewRequirementApplier != null && !viewRequirementApplier.isEmpty()) {
118+
if (!bypass && !viewRequirementApplier.isEmpty()) {
120119
Requirement.Result result = viewRequirementApplier.getResult(uuid);
121120

122121
BatchRunnable batchRunnable = new BatchRunnable();
@@ -147,10 +146,10 @@ public ArgumentHandler getArgumentHandler() {
147146
public StringReplacer getStringReplacer() {
148147
return StringReplacer.either(
149148
(LookupStringReplacer) original -> {
150-
if (original.startsWith("view") && viewRequirementApplier != null) {
149+
if (original.startsWith("view") && !viewRequirementApplier.isEmpty()) {
151150
return Pair.of(viewRequirementApplier.getStringReplacer(), original.substring("view".length()));
152151
}
153-
if (original.startsWith("close") && closeRequirementApplier != null) {
152+
if (original.startsWith("close") && !closeRequirementApplier.isEmpty()) {
154153
return Pair.of(closeRequirementApplier.getStringReplacer(), original.substring("close".length()));
155154
}
156155
if (original.startsWith("arg")) {

0 commit comments

Comments
 (0)