From 90b5a65c622f2f8482b4a3362f70b49bff8a994a Mon Sep 17 00:00:00 2001 From: Baterka Date: Tue, 24 Nov 2020 15:43:37 +0100 Subject: [PATCH] Fixed https://github.com/BentoBoxWorld/Limits/issues/114 --- .../bentobox/limits/listeners/EntityLimitListener.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java b/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java index 4747a5f..7fe587c 100644 --- a/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java +++ b/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java @@ -443,6 +443,14 @@ public class EntityLimitListener implements Listener { return new AtLimitResult(ent.getType(), limitAmount); } + // Merge in any permission-based limits + if (addon.getBlockLimitListener().getIsland(island.getUniqueId()) != null) { + Map 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 group : groupsLimits.entrySet()) { //do not use lambda if (group.getValue() < 0)