From 7eb7e7926c8ad9af9ff19a21ce8fc07c87ff7b1f Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 1 Apr 2021 14:13:52 +0100 Subject: [PATCH] Improved target ticker --- .../java/com/willfp/ecobosses/bosses/LivingEcoBoss.java | 6 ------ .../willfp/ecobosses/bosses/tick/tickers/TargetTicker.java | 6 ++---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java index e233d57..1abc5a1 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java @@ -125,12 +125,6 @@ public class LivingEcoBoss extends PluginDependent { .replace("%z%", StringUtils.internalToString(entity.getLocation().getBlockZ())) ); } - - for (Entity nearbyEntity : entity.getNearbyEntities(15, 15, 15)) { - if (nearbyEntity instanceof Player && entity instanceof Mob) { - ((Mob) entity).setTarget((LivingEntity) nearbyEntity); - } - } } private void tick(final long tick, diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/tick/tickers/TargetTicker.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/tick/tickers/TargetTicker.java index f3a392e..0534aa7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/tick/tickers/TargetTicker.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/tick/tickers/TargetTicker.java @@ -15,10 +15,8 @@ public class TargetTicker implements BossTicker { final long tick) { if (tick % 10 == 0) { for (Entity nearbyEntity : entity.getNearbyEntities(10, 5, 10)) { - if (nearbyEntity instanceof Player) { - if (entity instanceof Mob) { - ((Mob) entity).setTarget((Player) nearbyEntity); - } + if (nearbyEntity instanceof Player && entity instanceof Mob) { + ((Mob) entity).setTarget((Player) nearbyEntity); } } }