From ec2bed91c44e7ccc2c6aa611724858a9ea6c9eae Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Mon, 8 Nov 2021 17:21:05 +0300 Subject: [PATCH] Fixed NPE if one of top damagers leave from server before rewards are given --- .../willfp/ecobosses/bosses/listeners/DeathListeners.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java index 5497305..754ee91 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java @@ -26,6 +26,7 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; public class DeathListeners extends PluginDependent implements Listener { /** @@ -90,13 +91,13 @@ public class DeathListeners extends PluginDependent implements Listen String na = this.getPlugin().getLangYml().getString("na"); - String topDamager = top == null ? na : Bukkit.getPlayer(top.playerUUID()).getDisplayName(); + String topDamager = top == null ? na : Objects.requireNonNull(Bukkit.getPlayer(top.playerUUID()).getDisplayName(), na); String topDamage = top == null ? na : StringUtils.internalToString(top.damage()); - String secondDamager = second == null ? na : Bukkit.getPlayer(second.playerUUID()).getDisplayName(); + String secondDamager = second == null ? na : Objects.requireNonNull(Bukkit.getPlayer(second.playerUUID()).getDisplayName(), na); String secondDamage = second == null ? na : StringUtils.internalToString(second.damage()); - String thirdDamager = third == null ? na : Bukkit.getPlayer(third.playerUUID()).getDisplayName(); + String thirdDamager = third == null ? na : Objects.requireNonNull(Bukkit.getPlayer(third.playerUUID()).getDisplayName(), na); String thirdDamage = third == null ? na : StringUtils.internalToString(third.damage()); for (String spawnMessage : boss.getDeathMessages()) {