Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7813de12 Fix arrow immunity loophole (#13452)
PaperMC/Paper@6d5a450f Add additional ray trace API (#12162)
PaperMC/Paper@8c6b6327 Properly update hidden effects (#13173)
PaperMC/Paper@5875d880 Fix inventory desyncs with certain cancelled interactions (#12960)
This commit is contained in:
granny
2025-12-30 17:01:33 -08:00
parent 25642b6766
commit 29e98ecdba
12 changed files with 37 additions and 51 deletions

View File

@@ -8,7 +8,7 @@
}
// CraftBukkit end
@@ -482,6 +_,7 @@
@@ -490,6 +_,7 @@
public InteractionHand interactHand;
public ItemStack interactItemStack;
public InteractionResult useItemOn(ServerPlayer player, Level level, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) {
@@ -16,7 +16,7 @@
BlockPos blockPos = hitResult.getBlockPos();
BlockState blockState = level.getBlockState(blockPos);
boolean cancelledBlock = false;
@@ -524,7 +_,7 @@
@@ -538,7 +_,7 @@
boolean flag = !player.getMainHandItem().isEmpty() || !player.getOffhandItem().isEmpty();
boolean flag1 = player.isSecondaryUseActive() && flag;
ItemStack itemStack = stack.copy();
@@ -25,7 +25,7 @@
InteractionResult interactionResult = blockState.useItemOn(player.getItemInHand(hand), level, player, hand, hitResult);
if (interactionResult.consumesAction()) {
CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(player, blockPos, itemStack);
@@ -570,4 +_,18 @@
@@ -584,4 +_,18 @@
public void setLevel(ServerLevel level) {
this.level = level;
}