diff --git a/pom.xml b/pom.xml
index 1964482..aab8bcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
world.bentobox
limits
- 0.2.2
+ 0.2.3-SNAPSHOT
addon-limits
An add-on for BentoBox that limits blocks and entities on islands.
https://github.com/BentoBoxWorld/addon-level
diff --git a/src/main/java/bentobox/addon/limits/Settings.java b/src/main/java/bentobox/addon/limits/Settings.java
index 07b9233..ce3cdd2 100644
--- a/src/main/java/bentobox/addon/limits/Settings.java
+++ b/src/main/java/bentobox/addon/limits/Settings.java
@@ -25,7 +25,9 @@ public class Settings {
for (String key : el.getKeys(false)) {
EntityType type = getType(key);
if (type != null) {
- if (!type.isSpawnable() || (LimitPanel.E2M.containsKey(type) && LimitPanel.E2M.get(type) == null)) {
+ if (!type.equals(EntityType.PAINTING) &&
+ !type.equals(EntityType.ITEM_FRAME) &&
+ (!type.isSpawnable() || (LimitPanel.E2M.containsKey(type) && LimitPanel.E2M.get(type) == null))) {
addon.logError("Entity type: " + key + " is not supported - skipping...");
} else {
limits.put(type, el.getInt(key, 0));
diff --git a/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java b/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java
index 7e2d9e5..b5d0b60 100644
--- a/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java
+++ b/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java
@@ -1,5 +1,6 @@
package bentobox.addon.limits.listeners;
+import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -7,6 +8,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.event.hanging.HangingPlaceEvent;
import org.bukkit.event.vehicle.VehicleCreateEvent;
import bentobox.addon.limits.Limits;
@@ -86,16 +88,7 @@ public class EntityLimitListener implements Listener {
case CURED:
case EGG:
case SPAWNER_EGG:
- // If someone in that area has the bypass permission, allow the spawning
- for (Entity entity : e.getLocation().getWorld().getNearbyEntities(e.getLocation(), 5, 5, 5)) {
- if (entity instanceof Player) {
- Player player = (Player)entity;
- if (player.isOp() || player.hasPermission(addon.getPlugin().getIWM().getPermissionPrefix(e.getEntity().getWorld()) + "mod.bypass")) {
- bypass = true;
- break;
- }
- }
- }
+ bypass = checkByPass(e.getLocation());
break;
default:
// Other natural reasons
@@ -106,6 +99,41 @@ public class EntityLimitListener implements Listener {
}
+ private boolean checkByPass(Location l) {
+ // If someone in that area has the bypass permission, allow the spawning
+ for (Entity entity : l.getWorld().getNearbyEntities(l, 5, 5, 5)) {
+ if (entity instanceof Player) {
+ Player player = (Player)entity;
+ if (player.isOp() || player.hasPermission(addon.getPlugin().getIWM().getPermissionPrefix(l.getWorld()) + "mod.bypass")) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * handles paintings and item frames
+ * @param e - event
+ */
+ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+ public void onBlock(HangingPlaceEvent e) {
+ Player player = e.getPlayer();
+ boolean bypass = player.isOp() || player.hasPermission(addon.getPlugin().getIWM().getPermissionPrefix(e.getEntity().getWorld()) + "mod.bypass");
+
+ addon.getIslands().getIslandAt(e.getEntity().getLocation()).ifPresent(island -> {
+ // Check if entity can be hung
+ if (!island.isSpawn() && atLimit(island, bypass, e.getEntity())) {
+ // Not allowed
+ e.setCancelled(true);
+ User.getInstance(player).sendMessage("limits.hit-limit", "[material]",
+ Util.prettifyText(e.getEntity().getType().toString()),
+ "[number]", String.valueOf(addon.getSettings().getLimits().get(e.getEntity().getType())));
+
+ }
+ });
+ }
+
private void checkLimit(CreatureSpawnEvent e, boolean bypass) {
addon.getIslands().getIslandAt(e.getLocation()).ifPresent(island -> {
// Check if creature is allowed to spawn or not
@@ -136,9 +164,10 @@ public class EntityLimitListener implements Listener {
* @return true if at the limit, false if not
*/
private boolean atLimit(Island island, boolean bypass, Entity ent) {
- return addon.getSettings().getLimits().getOrDefault(ent.getType(), -1) <= ent.getWorld().getEntities().stream()
+ long count = ent.getWorld().getEntities().stream()
.filter(e -> e.getType().equals(ent.getType()))
.filter(e -> island.inIslandSpace(e.getLocation())).count();
+ return addon.getSettings().getLimits().getOrDefault(ent.getType(), -1) <= count;
}
}