|
20 | 20 | import me.hsgamer.hscore.task.BatchRunnable; |
21 | 21 | import org.bukkit.entity.Player; |
22 | 22 | import org.bukkit.permissions.Permission; |
23 | | -import org.jetbrains.annotations.Nullable; |
24 | 23 |
|
25 | 24 | import java.util.Collections; |
26 | 25 | import java.util.List; |
|
44 | 43 | public abstract class BaseMenu extends StandardMenu { |
45 | 44 | protected final ActionApplier openActionApplier; |
46 | 45 | 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; |
49 | 48 | protected final List<Permission> permissions; |
50 | 49 | protected final ArgumentHandler argumentHandler; |
51 | 50 |
|
@@ -116,7 +115,7 @@ public boolean create(Player player, String[] args, boolean bypass) { |
116 | 115 | } |
117 | 116 |
|
118 | 117 | // Check Requirement |
119 | | - if (!bypass && viewRequirementApplier != null && !viewRequirementApplier.isEmpty()) { |
| 118 | + if (!bypass && !viewRequirementApplier.isEmpty()) { |
120 | 119 | Requirement.Result result = viewRequirementApplier.getResult(uuid); |
121 | 120 |
|
122 | 121 | BatchRunnable batchRunnable = new BatchRunnable(); |
@@ -147,10 +146,10 @@ public ArgumentHandler getArgumentHandler() { |
147 | 146 | public StringReplacer getStringReplacer() { |
148 | 147 | return StringReplacer.either( |
149 | 148 | (LookupStringReplacer) original -> { |
150 | | - if (original.startsWith("view") && viewRequirementApplier != null) { |
| 149 | + if (original.startsWith("view") && !viewRequirementApplier.isEmpty()) { |
151 | 150 | return Pair.of(viewRequirementApplier.getStringReplacer(), original.substring("view".length())); |
152 | 151 | } |
153 | | - if (original.startsWith("close") && closeRequirementApplier != null) { |
| 152 | + if (original.startsWith("close") && !closeRequirementApplier.isEmpty()) { |
154 | 153 | return Pair.of(closeRequirementApplier.getStringReplacer(), original.substring("close".length())); |
155 | 154 | } |
156 | 155 | if (original.startsWith("arg")) { |
|
0 commit comments