Merge branch 'develop' of https://github.com/BentoBoxWorld/Limits.git into develop

This commit is contained in:
tastybento 2020-03-18 08:36:50 -07:00
commit 55bb288dad
4 changed files with 62 additions and 3 deletions

View File

@ -56,4 +56,28 @@ Usage permissions are (put the gamemode name, e.g. acidisland at the front):
default: op default: op
``` ```
## Items that cannot be limited
Some items cannot be limited (right now). The reasons are usually because there are too many ways to remove the item without it being tracked. If you are a programmer and can work out how to fix these, then please submit a PR!
* Primed TNT
* Evoker Fangs
* Llama Spit
* Dragon Fireball
* Area Effect Cloud
* Ender signal
* Small fireball
* Fireball
* Thrown Exp Bottle
* Shulker Bullet
* Wither Skull
* Tridents
* Arrows
* Spectral Arrows
* Snowballs
* Eggs
* Leashes
* Ender crystals
* Ender pearls
* Ender dragon
* Item frames
* Paintings

View File

@ -64,7 +64,7 @@
<!-- Do not change unless you want different name for local builds. --> <!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number> <build.number>-LOCAL</build.number>
<!-- This allows to change between versions. --> <!-- This allows to change between versions. -->
<build.version>1.9.1</build.version> <build.version>1.9.2</build.version>
</properties> </properties>
<!-- Profiles will allow to automatically change build version. --> <!-- Profiles will allow to automatically change build version. -->

View File

@ -141,13 +141,13 @@ public class LimitPanel {
.filter(e -> e.getType().equals(ent)) .filter(e -> e.getType().equals(ent))
.filter(e -> island.inIslandSpace(e.getLocation())).count(); .filter(e -> island.inIslandSpace(e.getLocation())).count();
// Nether // Nether
if (addon.getPlugin().getIWM().isNetherIslands(island.getWorld())) { if (addon.getPlugin().getIWM().isNetherIslands(island.getWorld()) && addon.getPlugin().getIWM().getNetherWorld(island.getWorld()) != null) {
count += addon.getPlugin().getIWM().getNetherWorld(island.getWorld()).getEntities().stream() count += addon.getPlugin().getIWM().getNetherWorld(island.getWorld()).getEntities().stream()
.filter(e -> e.getType().equals(ent)) .filter(e -> e.getType().equals(ent))
.filter(e -> island.inIslandSpace(e.getLocation())).count(); .filter(e -> island.inIslandSpace(e.getLocation())).count();
} }
// End // End
if (addon.getPlugin().getIWM().isEndIslands(island.getWorld())) { if (addon.getPlugin().getIWM().isEndIslands(island.getWorld()) && addon.getPlugin().getIWM().getEndWorld(island.getWorld()) != null) {
count += addon.getPlugin().getIWM().getEndWorld(island.getWorld()).getEntities().stream() count += addon.getPlugin().getIWM().getEndWorld(island.getWorld()).getEntities().stream()
.filter(e -> e.getType().equals(ent)) .filter(e -> e.getType().equals(ent))
.filter(e -> island.inIslandSpace(e.getLocation())).count(); .filter(e -> island.inIslandSpace(e.getLocation())).count();

View File

@ -0,0 +1,35 @@
###########################################################################################
# This is a YML file. Be careful when editing. Check your edits in a YAML checker like #
# the one at http://yaml-online-parser.appspot.com #
# #
# Translation by: CZghost #
###########################################################################################
block-limits:
hit-limit: "&c[material] omezen na [number]!"
entity-limits:
hit-limit: "&cSpawnování [entity] omezeno na [number]!"
limits:
panel-title: "Omezení ostrovů"
admin:
limits:
main:
parameters: "<player>"
description: "ukázat omezení ostrova hráče"
calc:
parameters: "<player>"
description: "přepočítat omezení ostrova hráče"
finished: "&aPřepočítání ostrova úspěšně dokončeno!"
island:
limits:
description: "ukázat omezení tvého ostrova"
max-color: "&c"
regular-color: "&a"
block-limit-syntax: "[number]/[limit]"
no-limits: "&cTento svět nemá žádné omezení"
recount:
description: "přepočítá omezení tvého ostrova"