fix: NPE when the player's death is attributed to player who is no lo…

…nger part of any team
ScreamingSandals · Jun 16, 2024 · 91bbb28 · 91bbb28
1 parent cb1502b
commit 91bbb28
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugin/src/main/java/org/screamingsandals/bedwars/listener/PlayerListener.java b/plugin/src/main/java/org/screamingsandals/bedwars/listener/PlayerListener.java
@@ -92,7 +92,7 @@ public void onPlayerDeath(PlayerDeathEvent event) {
                 if (Main.getConfigurator().config.getBoolean("chat.send-death-messages-just-in-game")) {
                     String deathMessage = event.getDeathMessage();
                     if (Main.getConfigurator().config.getBoolean("chat.send-custom-death-messages")) {
-                        if (event.getEntity().getKiller() != null) {
+                        if (event.getEntity().getKiller() != null && game.isPlayerInAnyTeam(event.getEntity().getKiller())) {
                             Player killer = event.getEntity().getKiller();
                             GamePlayer gKiller = Main.getPlayerGameProfile(killer);
                             CurrentTeam killerTeam = game.getPlayerTeam(gKiller);