From 167ed811b6d6ab1142f59fac88c08392de7fc167 Mon Sep 17 00:00:00 2001 From: David Rauh Date: Sat, 19 Sep 2026 21:12:36 +0200 Subject: [PATCH] fix: update lore text for silence nametag and improve nullability handling --- .../gameplay/silenceNametag/NametagAnvilListener.java | 11 ++++------- .../gameplay/silenceNametag/SilenceNametag.java | 7 ++++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/NametagAnvilListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/NametagAnvilListener.java index 01da3bb..bd265b6 100644 --- a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/NametagAnvilListener.java +++ b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/NametagAnvilListener.java @@ -1,16 +1,12 @@ package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.silenceNametag; import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener; -import net.kyori.adventure.text.Component; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.view.AnvilView; -import java.util.ArrayList; -import java.util.List; - public class NametagAnvilListener extends ApplianceListener { @EventHandler public void onAnvilRename(PrepareAnvilEvent event){ @@ -22,10 +18,11 @@ public class NametagAnvilListener extends ApplianceListener { ItemStack inputItem = anvilView.getItem(0); if(inputItem == null || inputItem.getType() != Material.NAME_TAG) return; + String renameText = anvilView.getRenameText(); - if(!SilenceNametag.muteString.equals(anvilView.getRenameText()) - && !SilenceNametag.unmuteString.equals(anvilView.getRenameText())) return; + if(!SilenceNametag.muteString.equals(renameText) + && !SilenceNametag.unmuteString.equals(renameText)) return; - event.setResult(this.getAppliance().createSilenceNametag(resultItem, anvilView.getRenameText())); + event.setResult(this.getAppliance().createSilenceNametag(resultItem, renameText)); } } diff --git a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/SilenceNametag.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/SilenceNametag.java index c1cc9e4..99d4499 100644 --- a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/SilenceNametag.java +++ b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/SilenceNametag.java @@ -7,6 +7,7 @@ import org.bukkit.event.Listener; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; @@ -37,9 +38,9 @@ public class SilenceNametag extends Appliance { item.editMeta(meta -> { List lore = meta.hasLore() ? new ArrayList<>(meta.lore()) : new ArrayList<>(); if(action == NametagActions.SILENCE) { - lore.add(Component.text("Dieses Namensschild verstummt Mobs.")); + lore.add(Component.text("Dieser Name Tag verstummt Mobs.")); } else if (action == NametagActions.UNSILENCE){ - lore.add(Component.text("Dieses Namensschild entstummt Mobs.")); + lore.add(Component.text("Dieser Name Tag entstummt Mobs.")); } meta.customName(null); meta.lore(lore); @@ -47,7 +48,7 @@ public class SilenceNametag extends Appliance { return item; } - NametagActions getNametagAction(ItemStack item) { + @Nullable NametagActions getNametagAction(ItemStack item) { Objects.requireNonNull(item, "item must not be null"); return item.getPersistentDataContainer().get(nametagActionKey, PersistentDataType.INTEGER) == null ? null