CraftAttack/spawn
5
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

fixed bug in HotBarRefill when using Blocks

Browse Source
This commit is contained in:
Elias Müller
2025-07-19 22:32:47 +02:00
parent ef6f34c2b2
commit ec2d243b7b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefill.java
View File

@ -44,7 +44,7 @@ public class HotbarRefill extends Appliance {
inventory.setItem(itemSlot, secondItem); inventory.setItem(itemSlot, secondItem);
inventory.setItem(replacementSlot, firstItem); 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); }, 1);
} catch(NoSuchElementException ignored) { } catch(NoSuchElementException ignored) {
} }

5
craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/gameplay/hotbarRefill/HotbarRefillListener.java
View File

@ -26,7 +26,7 @@ class HotbarRefillListener extends ApplianceListener<HotbarRefill> {
ItemStack stackInHand = event.getItemInHand(); ItemStack stackInHand = event.getItemInHand();
if(stackInHand.getAmount() != 1) return; if(stackInHand.getAmount() != 1) return;
if(stackInHand.getType().getMaxDurability() > 0) 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; if(!this.getPlayerSetting(event.getPlayer()).onBlocks()) return;
this.getAppliance().handleHotbarChange(event.getPlayer(), stackInHand); this.getAppliance().handleHotbarChange(event.getPlayer(), stackInHand);
@ -35,15 +35,14 @@ class HotbarRefillListener extends ApplianceListener<HotbarRefill> {
@EventHandler @EventHandler
public void onPlayerItemBreak(PlayerItemBreakEvent event) { public void onPlayerItemBreak(PlayerItemBreakEvent event) {
if(!this.getPlayerSetting(event.getPlayer()).onTools()) return; if(!this.getPlayerSetting(event.getPlayer()).onTools()) return;
this.getAppliance().handleHotbarChange(event.getPlayer(), event.getBrokenItem()); this.getAppliance().handleHotbarChange(event.getPlayer(), event.getBrokenItem());
} }
@EventHandler @EventHandler
public void onPlayerItemConsume(PlayerItemConsumeEvent event) { public void onPlayerItemConsume(PlayerItemConsumeEvent event) {
if(List.of(Material.POTION, Material.HONEY_BOTTLE).contains(event.getItem().getType())) return; 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()); this.getAppliance().handleHotbarChange(event.getPlayer(), event.getItem());
} }
} }