fix: Console exception in 3.0.1

WiIIiam278 · Feb 19, 2024 · 2aee5e4 · 2aee5e4
1 parent 92169d8
commit 2aee5e4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/bukkit/src/main/java/net/william278/husktowns/hook/LuckPermsHook.java b/bukkit/src/main/java/net/william278/husktowns/hook/LuckPermsHook.java
@@ -145,11 +145,11 @@ public ContextSet estimatePotentialContexts() {
 
         private void setContextsFromRules(@NotNull ContextConsumer consumer, Rules wilderness) {
             consumer.accept(ContextKey.CAN_PLAYER_BUILD.getKey(plugin), wilderness
-                    .cancelOperation(OperationType.BLOCK_BREAK) ? "false" : "true");
+                    .cancelOperation(OperationType.BLOCK_BREAK, plugin.getFlags()) ? "false" : "true");
             consumer.accept(ContextKey.CAN_PLAYER_OPEN_CONTAINERS.getKey(plugin), wilderness
-                    .cancelOperation(OperationType.CONTAINER_OPEN) ? "false" : "true");
+                    .cancelOperation(OperationType.CONTAINER_OPEN, plugin.getFlags()) ? "false" : "true");
             consumer.accept(ContextKey.CAN_PLAYER_INTERACT.getKey(plugin), wilderness
-                    .cancelOperation(OperationType.BLOCK_INTERACT) ? "false" : "true");
+                    .cancelOperation(OperationType.BLOCK_INTERACT, plugin.getFlags()) ? "false" : "true");
         }
     }
 

diff --git a/common/src/main/java/net/william278/husktowns/claim/Rules.java b/common/src/main/java/net/william278/husktowns/claim/Rules.java
@@ -106,23 +106,27 @@ public boolean hasFlagSet(@NotNull Flag flag) {
     public void setFlag(@NotNull Flag flag, boolean value) {
         if (flags.containsKey(flag.getName())) {
             flags.replace(flag.getName(), value);
-            calculatedFlags.replace(flag, value);
+            if (calculatedFlags != null) {
+                calculatedFlags.replace(flag, value);
+            }
         } else {
             flags.put(flag.getName(), value);
-            calculatedFlags.put(flag, value);
+            if (calculatedFlags != null) {
+                calculatedFlags.put(flag, value);
+            }
         }
     }
 
     /**
      * Whether, for the given operation, the flag rules set indicate it should be cancelled
      *
-     * @param type       the operation type that is being performed in a region governed by these rules
+     * @param type the operation type that is being performed in a region governed by these rules
      * @return Whether the operation should be canceled:
      * <p>
      * {@code true} if no flags have been set to {@code true} that permit the operation; {@code false} otherwise
      */
-    public boolean cancelOperation(@NotNull OperationType type) {
-        return calculatedFlags.entrySet().stream()
+    public boolean cancelOperation(@NotNull OperationType type, @NotNull Flags flagConfig) {
+        return getCalculatedFlags(flagConfig).entrySet().stream()
                 .filter(Map.Entry::getValue)
                 .noneMatch(entry -> entry.getKey().isOperationAllowed(type));
     }

diff --git a/common/src/main/java/net/william278/husktowns/listener/OperationHandler.java b/common/src/main/java/net/william278/husktowns/listener/OperationHandler.java
@@ -151,7 +151,8 @@ && cancelFriendlyFire(optionalUser.get(), optionalVictim.get())) {
         // Handle operations in unclaimable worlds
         final Optional<ClaimWorld> world = getPlugin().getClaimWorld((World) operation.getOperationPosition().getWorld());
         if (world.isEmpty()) {
-            if (getPlugin().getRulePresets().getUnclaimableWorldRules(getPlugin().getFlags()).cancelOperation(operation.getType())) {
+            if (getPlugin().getRulePresets().getUnclaimableWorldRules(getPlugin().getFlags())
+                    .cancelOperation(operation.getType(), getPlugin().getFlags())) {
                 if (operation.isVerbose() && optionalUser.isPresent()) {
                     getPlugin().getLocales().getLocale("operation_cancelled")
                             .ifPresent(optionalUser.get()::sendMessage);
@@ -163,7 +164,7 @@ && cancelFriendlyFire(optionalUser.get(), optionalVictim.get())) {
 
         // Handle operations in claim worlds
         if (getPlugin().getRulePresets().getWildernessRules(getPlugin().getFlags())
-                .cancelOperation(operation.getType())) {
+                .cancelOperation(operation.getType(), getPlugin().getFlags())) {
             if (operation.isVerbose() && optionalUser.isPresent()) {
                 getPlugin().getLocales().getLocale("operation_cancelled")
                         .ifPresent(optionalUser.get()::sendMessage);
@@ -192,11 +193,12 @@ private boolean cancelOperation(@NotNull Operation operation, @NotNull TownClaim
                                 .map(online -> war.isPlayerActive(online.getUuid()))
                                 .orElse(false))
                         .orElse(false)) {
-            return getPlugin().getRulePresets().getWartimeRules(getPlugin().getFlags()).cancelOperation(operation.getType());
+            return getPlugin().getRulePresets().getWartimeRules(getPlugin().getFlags())
+                    .cancelOperation(operation.getType(), getPlugin().getFlags());
         }
 
         // If the operation is not allowed by the claim flags
-        if (town.getRules().get(claim.getType()).cancelOperation(operation.getType())) {
+        if (town.getRules().get(claim.getType()).cancelOperation(operation.getType(), getPlugin().getFlags())) {
             if (optionalUser.isEmpty()) {
                 return true;
             }

diff --git a/docs/Config-Files.md b/docs/Config-Files.md
@@ -231,6 +231,7 @@ flags:
     - PLAYER_DAMAGE_PLAYER
   monster_spawning:
     - MONSTER_SPAWN
+    - PASSIVE_MOB_SPAWN
     - PLAYER_DAMAGE_MONSTER
   public_interact_access:
     - ENTITY_INTERACT

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ javaVersion=16
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.daemon=true
 
-plugin_version=3.0.1
+plugin_version=3.0.2
 plugin_archive=husktowns
 plugin_description=Simple and elegant proxy-compatible Towny-style protection