diff --git a/paper-server/patches/sources/com/mojang/brigadier/tree/CommandNode.java.patch b/paper-server/patches/sources/com/mojang/brigadier/tree/CommandNode.java.patch index 39c18089dd..1b5e8b98af 100644 --- a/paper-server/patches/sources/com/mojang/brigadier/tree/CommandNode.java.patch +++ b/paper-server/patches/sources/com/mojang/brigadier/tree/CommandNode.java.patch @@ -38,7 +38,7 @@ } - public boolean canUse(final S source) { -+ // Paper start ++ // CraftBukkit start + public synchronized boolean canUse(final S source) { + if (source instanceof CommandSourceStack) { + try { @@ -48,7 +48,7 @@ + ((CommandSourceStack) source).currentCommand.remove(Thread.currentThread()); // Paper - Thread Safe Vanilla Command permission checking + } + } -+ // Paper end ++ // CraftBukkit end return requirement.test(source); } diff --git a/paper-server/patches/sources/net/minecraft/core/cauldron/CauldronInteraction.java.patch b/paper-server/patches/sources/net/minecraft/core/cauldron/CauldronInteraction.java.patch index 3cadc7f318..46043286c6 100644 --- a/paper-server/patches/sources/net/minecraft/core/cauldron/CauldronInteraction.java.patch +++ b/paper-server/patches/sources/net/minecraft/core/cauldron/CauldronInteraction.java.patch @@ -227,7 +227,7 @@ ) { return (InteractionResult)(isUnderWater(level, pos) ? InteractionResult.CONSUME -@@ -269,50 +_,65 @@ +@@ -269,53 +_,68 @@ hand, filledStack, Blocks.POWDER_SNOW_CAULDRON.defaultBlockState().setValue(LayeredCauldronBlock.LEVEL, Integer.valueOf(3)), @@ -298,4 +298,8 @@ + // CraftBukkit end stack.remove(DataComponents.DYED_COLOR); player.awardStat(Stats.CLEAN_ARMOR); - LayeredCauldronBlock.lowerFillLevel(state, level, pos); +- LayeredCauldronBlock.lowerFillLevel(state, level, pos); ++ // LayeredCauldronBlock.lowerFillLevel(state, level, pos); // CraftBukkit + } + + return InteractionResult.SUCCESS;