Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-03 14:22:25 +00:00
Code Issues Releases Activity

Update ItemEventListener.java

Browse Source
This commit is contained in:
XiaoMoMi
2025-05-13 02:57:22 +08:00
parent 748cf572e8
commit 71550dd183
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/ItemEventListener.java
View File

@@ -73,11 +73,6 @@ public class ItemEventListener implements Listener {
Object blockState = BlockStateUtils.blockDataToBlockState(blockData);
ImmutableBlockState immutableBlockState = null;
int stateId = BlockStateUtils.blockStateToId(blockState);
Item<ItemStack> itemInHand = serverPlayer.getItemInHand(hand);
Optional<CustomItem<ItemStack>> optionalCustomItem = itemInHand == null ? Optional.empty() : itemInHand.getCustomItem();
boolean hasItem = itemInHand != null;
boolean hasCustomItem = optionalCustomItem.isPresent();
// 处理自定义方块
if (!BlockStateUtils.isVanillaBlock(stateId)) {
@@ -98,6 +93,7 @@ public class ItemEventListener implements Listener {
event.setCancelled(true);
return;
}
// run custom functions
CustomBlock customBlock = immutableBlockState.owner().value();
PlayerBlockActionContext context = PlayerBlockActionContext.of(serverPlayer, new BukkitBlockInWorld(block), ContextHolder.builder()
@@ -112,6 +108,11 @@ public class ItemEventListener implements Listener {
else customBlock.execute(context, EventTrigger.LEFT_CLICK);
}
Item<ItemStack> itemInHand = serverPlayer.getItemInHand(hand);
Optional<CustomItem<ItemStack>> optionalCustomItem = itemInHand == null ? Optional.empty() : itemInHand.getCustomItem();
boolean hasItem = itemInHand != null;
boolean hasCustomItem = optionalCustomItem.isPresent();
// interact block with items
if (hasItem && action == Action.RIGHT_CLICK_BLOCK) {
Location interactionPoint = Objects.requireNonNull(event.getInteractionPoint(), "interaction point should not be null");