Fixes bug where permission limits were given to everyone

Fixes #79
BentoBoxWorld · Apr 30, 2020 · b58859a · b58859a
1 parent 100f5ea
commit b58859a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/world/bentobox/limits/Settings.java b/src/main/java/world/bentobox/limits/Settings.java
@@ -1,6 +1,7 @@
 package world.bentobox.limits;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
@@ -70,7 +71,7 @@ private EntityType getType(String key) {
      * @return the limits
      */
     public Map<EntityType, Integer> getLimits() {
-        return limits;
+        return Collections.unmodifiableMap(limits);
     }
 
     /**

diff --git a/src/main/java/world/bentobox/limits/commands/LimitPanel.java b/src/main/java/world/bentobox/limits/commands/LimitPanel.java
@@ -1,5 +1,6 @@
 package world.bentobox.limits.commands;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
@@ -105,7 +106,7 @@ public void showLimits(World world, User user, UUID target) {
             pb.item(pib.build());
         }
         // Entity limits
-        Map<EntityType, Integer> map = addon.getSettings().getLimits();
+        Map<EntityType, Integer> map = new HashMap<>(addon.getSettings().getLimits());
         // Merge in any permission-based limits
         if (ibc != null) ibc.getEntityLimits().forEach(map::put);
         map.forEach((k,v) -> {

diff --git a/src/main/java/world/bentobox/limits/commands/LimitsCalc.java b/src/main/java/world/bentobox/limits/commands/LimitsCalc.java
@@ -1,6 +1,11 @@
 package world.bentobox.limits.commands;
 
-import java.util.*;
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;