From f1250f2879949557310d6fafe74fd804d958c5dc Mon Sep 17 00:00:00 2001 From: David Rauh Date: Fri, 25 Sep 2026 17:37:25 +0200 Subject: [PATCH] feat: streamline silence and unsilence logic in NametagEntityListener --- .../silenceNametag/NametagEntityListener.java | 33 ++----------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/NametagEntityListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/NametagEntityListener.java index dfa5bf5..d7bf3d0 100644 --- a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/NametagEntityListener.java +++ b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/silenceNametag/NametagEntityListener.java @@ -1,8 +1,6 @@ package eu.mhsl.craftattack.spawn.craftattack.appliances.gameplay.silenceNametag; import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.event.EventHandler; @@ -17,10 +15,8 @@ public class NametagEntityListener extends ApplianceListener { ItemStack item; if (event.getHand() == EquipmentSlot.HAND) { - System.out.println("Using main hand"); item = event.getPlayer().getInventory().getItemInMainHand(); } else { - System.out.println("Using off hand"); item = event.getPlayer().getInventory().getItemInOffHand(); } @@ -34,37 +30,14 @@ public class NametagEntityListener extends ApplianceListener { Entity mob = event.getRightClicked(); if (getAppliance().getNametagAction(item) == SilenceNametag.NametagActions.SILENCE) { - if(mob.isSilent()) { - event.getPlayer().sendMessage( - Component.text("Der Mob ist bereits verstummt.") - .color(NamedTextColor.RED) - ); - return; - } - System.out.println("Silencing mob"); + if(mob.isSilent()) return; mob.setSilent(true); - event.getPlayer().sendMessage( - Component.text("Der Mob wurde verstummt.") - .color(NamedTextColor.GREEN) - ); } else if (getAppliance().getNametagAction(item) == SilenceNametag.NametagActions.UNSILENCE) { - if (!mob.isSilent()) { - event.getPlayer().sendMessage( - Component.text("Der Mob ist bereits entstummt.") - .color(NamedTextColor.RED) - ); - return; - } - System.out.println("Unsilencing mob"); + if (!mob.isSilent()) return; mob.setSilent(false); - event.getPlayer().sendMessage( - Component.text("Der Mob wurde entstummt.") - .color(NamedTextColor.GREEN) - ); } - if (item.getItemMeta().customName() == null && event.getPlayer().getGameMode() != org.bukkit.GameMode.CREATIVE) { - System.out.println("Nametag has no custom name, reducing amount"); + if (item.getItemMeta().customName() == null) { item.setAmount(item.getAmount() - 1); } }