mirror of
https://github.com/BentoBoxWorld/Limits.git
synced 2024-09-27 22:17:26 +02:00
Fixes issue with entities not in config being limited.
https://github.com/BentoBoxWorld/Limits/issues/30
This commit is contained in:
parent
56f9a0e36e
commit
789df98d8c
@ -128,7 +128,7 @@ public class EntityLimitListener implements Listener {
|
|||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
User.getInstance(player).sendMessage("limits.hit-limit", "[material]",
|
User.getInstance(player).sendMessage("limits.hit-limit", "[material]",
|
||||||
Util.prettifyText(e.getEntity().getType().toString()),
|
Util.prettifyText(e.getEntity().getType().toString()),
|
||||||
"[number]", String.valueOf(addon.getSettings().getLimits().get(e.getEntity().getType())));
|
"[number]", String.valueOf(addon.getSettings().getLimits().getOrDefault(e.getEntity().getType(), -1)));
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -167,7 +167,7 @@ public class EntityLimitListener implements Listener {
|
|||||||
long count = ent.getWorld().getEntities().stream()
|
long count = ent.getWorld().getEntities().stream()
|
||||||
.filter(e -> e.getType().equals(ent.getType()))
|
.filter(e -> e.getType().equals(ent.getType()))
|
||||||
.filter(e -> island.inIslandSpace(e.getLocation())).count();
|
.filter(e -> island.inIslandSpace(e.getLocation())).count();
|
||||||
return addon.getSettings().getLimits().getOrDefault(ent.getType(), -1) <= count;
|
return addon.getSettings().getLimits().containsKey(ent.getType()) && count >= addon.getSettings().getLimits().get(ent.getType());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user