From f2e9f87fed3a84e4b7d37d5aa74c1bd22f3e983d Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 4 May 2019 21:28:40 -0700 Subject: [PATCH 1/4] Fixes bug where limits panel doesn't show if there are entity limits but no block limits. https://github.com/BentoBoxWorld/addon-limits/issues/18 --- src/main/java/bentobox/addon/limits/commands/LimitPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/bentobox/addon/limits/commands/LimitPanel.java b/src/main/java/bentobox/addon/limits/commands/LimitPanel.java index 7fb1470..7eaec8d 100644 --- a/src/main/java/bentobox/addon/limits/commands/LimitPanel.java +++ b/src/main/java/bentobox/addon/limits/commands/LimitPanel.java @@ -95,7 +95,7 @@ public class LimitPanel { } IslandBlockCount ibc = addon.getBlockLimitListener().getIsland(island.getUniqueId()); Map matLimits = addon.getBlockLimitListener().getMaterialLimits(world, island.getUniqueId()); - if (matLimits.isEmpty()) { + if (matLimits.isEmpty() && addon.getSettings().getLimits().isEmpty()) { user.sendMessage("island.limits.no-limits"); return; } From f2aa22123c6886570d50b6615bf37b78f09f6034 Mon Sep 17 00:00:00 2001 From: YellowZaki Date: Sun, 16 Jun 2019 14:30:27 +0200 Subject: [PATCH 2/4] Personalize messages differencing between block an entities --- .../bentobox/addon/limits/listeners/EntityLimitListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java b/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java index 7e2d9e5..4bca9ff 100644 --- a/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java +++ b/src/main/java/bentobox/addon/limits/listeners/EntityLimitListener.java @@ -53,7 +53,7 @@ public class EntityLimitListener implements Listener { for (Entity ent : e.getVehicle().getLocation().getWorld().getNearbyEntities(e.getVehicle().getLocation(), 5, 5, 5)) { if (ent instanceof Player) { ((Player) ent).updateInventory(); - User.getInstance(ent).sendMessage("limits.hit-limit", "[material]", + User.getInstance(ent).sendMessage("entity-limits.hit-limit", "[entity]", Util.prettifyText(e.getVehicle().getType().toString()) ,"[number]", String.valueOf(addon.getSettings().getLimits().get(e.getVehicle().getType()))); } @@ -116,7 +116,7 @@ public class EntityLimitListener implements Listener { if (!e.getSpawnReason().equals(SpawnReason.SPAWNER)) { for (Entity ent : e.getLocation().getWorld().getNearbyEntities(e.getLocation(), 5, 5, 5)) { if (ent instanceof Player) { - User.getInstance(ent).sendMessage("limits.hit-limit", "[material]", + User.getInstance(ent).sendMessage("entity-limits.hit-limit", "[entity]", Util.prettifyText(e.getEntityType().toString()), "[number]", String.valueOf(addon.getSettings().getLimits().get(e.getEntityType()))); } From e1e84a12ccd428dc6ac26a44cd85f4370f1891f0 Mon Sep 17 00:00:00 2001 From: YellowZaki Date: Sun, 16 Jun 2019 14:33:38 +0200 Subject: [PATCH 3/4] Added entity-hit-limit --- src/main/resources/locales/en-US.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 8cd0490..fb4aa2e 100755 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -4,7 +4,8 @@ ########################################################################################### limits: - hit-limit: "&c[material] limited to [number]!" + entity-hit-limit: "&c[entity] spawning limited to [number]!" + block-hit-limit: "&c[material] limited to [number]!" panel-title: "Island limits" admin: @@ -26,4 +27,4 @@ island: block-limit-syntax: "[number]/[limit]" no-limits: "&cNo limits set in this world" - \ No newline at end of file + From bd9db6245f9a63cfd81f0704d9be471cb84fb603 Mon Sep 17 00:00:00 2001 From: YellowZaki Date: Sun, 16 Jun 2019 14:35:10 +0200 Subject: [PATCH 4/4] limits.hit-limit -> block-limits.hit-limit --- .../bentobox/addon/limits/listeners/BlockLimitsListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java index 9838f7e..f2ed5df 100644 --- a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java +++ b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java @@ -168,7 +168,7 @@ public class BlockLimitsListener implements Listener { private void notify(Cancellable e, User user, int limit, Material m) { if (limit > -1) { - user.sendMessage("limits.hit-limit", + user.sendMessage("block-limits.hit-limit", "[material]", Util.prettifyText(m.toString()), TextVariables.NUMBER, String.valueOf(limit)); e.setCancelled(true);