From ec2d243b7bdd0fca4430b5350daa37b28c58744b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sat, 19 Jul 2025 22:32:47 +0200 Subject: [PATCH] fixed bug in HotBarRefill when using Blocks --- .../appliances/gameplay/hotbarRefill/HotbarRefill.java | 2 +- .../gameplay/hotbarRefill/HotbarRefillListener.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefill.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefill.java index 74ff5f5..1f4ef3d 100644 --- a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefill.java +++ b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefill.java @@ -44,7 +44,7 @@ public class HotbarRefill extends Appliance { inventory.setItem(itemSlot, secondItem); inventory.setItem(replacementSlot, firstItem); - player.sendActionBar(Component.text("Die Hotbar wurde aufgefüllt", NamedTextColor.GREEN)); + player.sendActionBar(Component.text("Deine Hotbar wurde nachgefüllt \uD83D\uDCE5", NamedTextColor.GREEN)); }, 1); } catch(NoSuchElementException ignored) { } diff --git a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefillListener.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefillListener.java index 0f8a532..719939f 100644 --- a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefillListener.java +++ b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefillListener.java @@ -26,7 +26,7 @@ class HotbarRefillListener extends ApplianceListener { ItemStack stackInHand = event.getItemInHand(); if(stackInHand.getAmount() != 1) return; if(stackInHand.getType().getMaxDurability() > 0) return; - if(stackInHand.getType().getMaxStackSize() > 0) return; + if(stackInHand.getType().getMaxStackSize() == 1) return; if(!this.getPlayerSetting(event.getPlayer()).onBlocks()) return; this.getAppliance().handleHotbarChange(event.getPlayer(), stackInHand); @@ -35,15 +35,14 @@ class HotbarRefillListener extends ApplianceListener { @EventHandler public void onPlayerItemBreak(PlayerItemBreakEvent event) { if(!this.getPlayerSetting(event.getPlayer()).onTools()) return; - this.getAppliance().handleHotbarChange(event.getPlayer(), event.getBrokenItem()); } @EventHandler public void onPlayerItemConsume(PlayerItemConsumeEvent event) { if(List.of(Material.POTION, Material.HONEY_BOTTLE).contains(event.getItem().getType())) return; - if(!this.getPlayerSetting(event.getPlayer()).onConsumable()) return; + if(!this.getPlayerSetting(event.getPlayer()).onConsumable()) return; this.getAppliance().handleHotbarChange(event.getPlayer(), event.getItem()); } }