Repo-Mirror/EcoMobs
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoMobs.git synced 2025-12-22 16:39:25 +00:00
Code Issues Releases 1 Activity

Removed null traces

Browse Source
This commit is contained in:
Auxilor
2021-07-27 16:22:32 +01:00
parent 746ab5d2b5
commit 846b03d8bc
3 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java
View File

@@ -9,7 +9,6 @@ import com.willfp.ecobosses.bosses.util.obj.DamagerProperty;
import com.willfp.ecobosses.bosses.util.obj.ImmunityOptions; import com.willfp.ecobosses.bosses.util.obj.ImmunityOptions;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@@ -56,7 +55,9 @@ public class AttackListeners extends PluginDependent<EcoPlugin> implements Liste
LivingEcoBoss livingEcoBoss = boss.getLivingBoss(entity); LivingEcoBoss livingEcoBoss = boss.getLivingBoss(entity);
BossUtils.warnIfNull(livingEcoBoss); if (livingEcoBoss == null) {
return;
}
if (boss.isAttackOnInjure()) { if (boss.isAttackOnInjure()) {
livingEcoBoss.handleAttack(player); livingEcoBoss.handleAttack(player);
@@ -124,7 +125,9 @@ public class AttackListeners extends PluginDependent<EcoPlugin> implements Liste
LivingEcoBoss livingEcoBoss = boss.getLivingBoss(entity); LivingEcoBoss livingEcoBoss = boss.getLivingBoss(entity);
BossUtils.warnIfNull(livingEcoBoss); if (livingEcoBoss == null) {
return;
}
livingEcoBoss.handleAttack(player); livingEcoBoss.handleAttack(player);
} }

6
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java
View File

@@ -3,7 +3,6 @@ package com.willfp.ecobosses.bosses.listeners;
import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.NumberUtils;
import com.willfp.ecobosses.bosses.EcoBoss; import com.willfp.ecobosses.bosses.EcoBoss;
import com.willfp.ecobosses.bosses.EcoBosses; import com.willfp.ecobosses.bosses.EcoBosses;
import com.willfp.ecobosses.bosses.util.BossUtils;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@@ -32,8 +31,9 @@ public class AutoSpawnTimer implements Runnable {
Set<World> worlds = new HashSet<>(); Set<World> worlds = new HashSet<>();
for (Entity entity : boss.getLivingBosses().keySet()) { for (Entity entity : boss.getLivingBosses().keySet()) {
BossUtils.warnIfNull(entity); if (entity == null) {
assert entity != null; continue;
}
worlds.add(entity.getWorld()); worlds.add(entity.getWorld());
} }

29
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/BossUtils.java
View File

@@ -3,7 +3,6 @@ package com.willfp.ecobosses.bosses.util;
import com.willfp.ecobosses.EcoBossesPlugin; import com.willfp.ecobosses.EcoBossesPlugin;
import com.willfp.ecobosses.bosses.EcoBoss; import com.willfp.ecobosses.bosses.EcoBoss;
import com.willfp.ecobosses.bosses.EcoBosses; import com.willfp.ecobosses.bosses.EcoBosses;
import com.willfp.ecobosses.bosses.LivingEcoBoss;
import com.willfp.ecobosses.bosses.util.obj.DamagerProperty; import com.willfp.ecobosses.bosses.util.obj.DamagerProperty;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@@ -153,32 +152,4 @@ public class BossUtils {
return player; 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!");
}
} }