From 41d2949553aa832502330264f86505ec4478b381 Mon Sep 17 00:00:00 2001 From: youhavetrouble Date: Fri, 30 Jun 2023 09:12:12 +0200 Subject: [PATCH] hide nameplate for spectators --- .../notjustnameplates/nameplates/Nameplate.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/youhavetrouble/notjustnameplates/nameplates/Nameplate.java b/src/main/java/me/youhavetrouble/notjustnameplates/nameplates/Nameplate.java index 3b54fcc..8b69b8e 100644 --- a/src/main/java/me/youhavetrouble/notjustnameplates/nameplates/Nameplate.java +++ b/src/main/java/me/youhavetrouble/notjustnameplates/nameplates/Nameplate.java @@ -6,8 +6,8 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; import org.bukkit.Color; +import org.bukkit.GameMode; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.entity.TextDisplay; @@ -119,7 +119,15 @@ public class Nameplate { return; } Player player = Bukkit.getPlayer(playerUuid); - if (player == null || player.isDead() || content.getCurrentFrame().text() == null) { + if (player == null || player.isDead()) { + remove(); + return; + } + if (content.getCurrentFrame().text() == null) { + remove(); + return; + } + if (player.getGameMode() == GameMode.SPECTATOR) { remove(); return; }