From 846b03d8bc9f92241c8cc0bffd06b3785bfb49de Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 27 Jul 2021 16:22:32 +0100 Subject: [PATCH] Removed null traces --- .../bosses/listeners/AttackListeners.java | 9 ++++-- .../bosses/listeners/AutoSpawnTimer.java | 6 ++-- .../ecobosses/bosses/util/BossUtils.java | 29 ------------------- 3 files changed, 9 insertions(+), 35 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java index fc58cf2..cc29bf9 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java @@ -9,7 +9,6 @@ import com.willfp.ecobosses.bosses.util.obj.DamagerProperty; import com.willfp.ecobosses.bosses.util.obj.ImmunityOptions; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.entity.Projectile; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -56,7 +55,9 @@ public class AttackListeners extends PluginDependent implements Liste LivingEcoBoss livingEcoBoss = boss.getLivingBoss(entity); - BossUtils.warnIfNull(livingEcoBoss); + if (livingEcoBoss == null) { + return; + } if (boss.isAttackOnInjure()) { livingEcoBoss.handleAttack(player); @@ -124,7 +125,9 @@ public class AttackListeners extends PluginDependent implements Liste LivingEcoBoss livingEcoBoss = boss.getLivingBoss(entity); - BossUtils.warnIfNull(livingEcoBoss); + if (livingEcoBoss == null) { + return; + } livingEcoBoss.handleAttack(player); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java index c4bcfca..ae1b282 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java @@ -3,7 +3,6 @@ package com.willfp.ecobosses.bosses.listeners; import com.willfp.eco.util.NumberUtils; import com.willfp.ecobosses.bosses.EcoBoss; import com.willfp.ecobosses.bosses.EcoBosses; -import com.willfp.ecobosses.bosses.util.BossUtils; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Entity; @@ -32,8 +31,9 @@ public class AutoSpawnTimer implements Runnable { Set worlds = new HashSet<>(); for (Entity entity : boss.getLivingBosses().keySet()) { - BossUtils.warnIfNull(entity); - assert entity != null; + if (entity == null) { + continue; + } worlds.add(entity.getWorld()); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/BossUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/BossUtils.java index 2774e9a..5352ecd 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/BossUtils.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/BossUtils.java @@ -3,7 +3,6 @@ package com.willfp.ecobosses.bosses.util; import com.willfp.ecobosses.EcoBossesPlugin; import com.willfp.ecobosses.bosses.EcoBoss; import com.willfp.ecobosses.bosses.EcoBosses; -import com.willfp.ecobosses.bosses.LivingEcoBoss; import com.willfp.ecobosses.bosses.util.obj.DamagerProperty; import lombok.experimental.UtilityClass; import org.bukkit.Bukkit; @@ -153,32 +152,4 @@ public class BossUtils { return player; } - - /** - * Warn if a boss is null. - * - * @param boss The boss. - */ - public void warnIfNull(@Nullable final LivingEcoBoss boss) { - if (boss != null) { - return; - } - - PLUGIN.getLogger().severe("Boss is null! Report this to Auxilor (https://discord.gg/ZcwpSsE)"); - PLUGIN.getLogger().severe("Send this stack-trace in the relevant channel."); - throw new NullPointerException("Boss is null!"); - } - - /** - * Warn if an entity is null. - */ - public void warnIfNull(@Nullable final Entity entity) { - if (entity != null) { - return; - } - - PLUGIN.getLogger().severe("Entity is null! Report this to Auxilor (https://discord.gg/ZcwpSsE)"); - PLUGIN.getLogger().severe("Send this stack-trace in the relevant channel."); - throw new NullPointerException("Entity is null!"); - } }