Upstream/Limits
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Limits.git synced 2025-02-21 14:52:15 +01:00
Code Issues Projects Releases Wiki Activity

Fixes bug where permission limits were given to everyone

Browse Source 
Fixes https://github.com/BentoBoxWorld/Limits/issues/79
This commit is contained in:
tastybento 2020-04-30 16:30:34 -07:00
parent 100f5ea026
commit b58859ae3f
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/world/bentobox/limits/Settings.java
View File

@ -1,6 +1,7 @@
package world.bentobox.limits; package world.bentobox.limits;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -70,7 +71,7 @@ public class Settings {
* @return the limits * @return the limits
*/ */
public Map<EntityType, Integer> getLimits() { public Map<EntityType, Integer> getLimits() {
return limits; return Collections.unmodifiableMap(limits);
} }
/** /**

3
src/main/java/world/bentobox/limits/commands/LimitPanel.java
View File

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

7
src/main/java/world/bentobox/limits/commands/LimitsCalc.java
View File

@ -1,6 +1,11 @@
package world.bentobox.limits.commands; 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.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;