From d7bff1df7deeb308b9d0f90d7e5c395b34d687ca Mon Sep 17 00:00:00 2001 From: YellowZaki Date: Fri, 25 Mar 2022 17:29:27 +0100 Subject: [PATCH] Turned into a Pladdon --- pom.xml | 22 ++++++++++------- .../world/bentobox/limits/LimitsPladdon.java | 24 +++++++++++++++++++ .../limits/listeners/EntityLimitListener.java | 2 +- 3 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 src/main/java/world/bentobox/limits/LimitsPladdon.java diff --git a/pom.xml b/pom.xml index 4bcf5e1..248b1ad 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,12 @@ ${spigot.version} provided + + org.spigotmc + plugin-annotations + 1.2.3-SNAPSHOT + provided + org.mockito @@ -196,14 +202,6 @@ maven-resources-plugin 3.1.0 - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - ${java.version} - - org.apache.maven.plugins maven-surefire-plugin @@ -272,6 +270,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + ${java.version} + + diff --git a/src/main/java/world/bentobox/limits/LimitsPladdon.java b/src/main/java/world/bentobox/limits/LimitsPladdon.java new file mode 100644 index 0000000..8bc79be --- /dev/null +++ b/src/main/java/world/bentobox/limits/LimitsPladdon.java @@ -0,0 +1,24 @@ +package world.bentobox.limits; + +import org.bukkit.plugin.java.annotation.dependency.Dependency; +import org.bukkit.plugin.java.annotation.plugin.ApiVersion; +import org.bukkit.plugin.java.annotation.plugin.Plugin; + +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.addons.Pladdon; + +/** + * + * @author YellowZaki + */ + +@Plugin(name="Pladdon", version="1.0") +@ApiVersion(ApiVersion.Target.v1_16) +@Dependency(value = "BentoBox") +public class LimitsPladdon extends Pladdon { + + @Override + public Addon getAddon() { + return new Limits(); + } +} diff --git a/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java b/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java index 0ac5f53..1453a09 100644 --- a/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java +++ b/src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java @@ -91,7 +91,7 @@ public class EntityLimitListener implements Listener { public void onBreed(final EntityBreedEvent e) { if (addon.inGameModeWorld(e.getEntity().getWorld()) && e.getBreeder() != null - && e.getBreeder() instanceof Player p + && (e.getBreeder() instanceof Player p) && !(p.isOp() || p.hasPermission(addon.getPlugin().getIWM().getPermissionPrefix(e.getEntity().getWorld()) + MOD_BYPASS)) && !checkLimit(e, e.getEntity(), SpawnReason.BREEDING, false) && e.getFather() instanceof Animals f && e.getMother() instanceof Animals m) {