Fixed #114

BentoBoxWorld · Nov 24, 2020 · 90b5a65 · 90b5a65
1 parent fbf13bd
commit 90b5a65
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java b/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java
@@ -443,6 +443,14 @@ AtLimitResult atLimit(Island island, Entity ent) {
                 return new AtLimitResult(ent.getType(), limitAmount);
         }
 
+        // Merge in any permission-based limits
+        if (addon.getBlockLimitListener().getIsland(island.getUniqueId()) != null) {
+            Map<String, EntityGroup> groupbyname = groupsLimits.keySet().stream().collect(Collectors.toMap(e -> e.getName(), e -> e));
+            addon.getBlockLimitListener().getIsland(island.getUniqueId()).getEntityGroupLimits().entrySet().stream()
+                    .filter(e -> groupbyname.containsKey(e.getKey()))
+                    .forEach(e -> groupsLimits.put(groupbyname.get(e.getKey()), e.getValue()));
+        }
+
         // Now do the group limits
         for (Map.Entry<Settings.EntityGroup, Integer> group : groupsLimits.entrySet()) { //do not use lambda
             if (group.getValue() < 0)