Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-12 14:50:03 +01:00
Code Issues Projects Releases Wiki Activity

Readd dropped CauldronInteraction hunk

Browse Source
This commit is contained in:
Nassim Jahnke 2024-12-15 16:09:49 +01:00
parent ac9ac5e7ea
commit 0895318159
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/patches/sources/com/mojang/brigadier/tree/CommandNode.java.patch
View File

@ -38,7 +38,7 @@
} }
- public boolean canUse(final S source) { - public boolean canUse(final S source) {
+ // Paper start + // CraftBukkit start
+ public synchronized boolean canUse(final S source) { + public synchronized boolean canUse(final S source) {
+ if (source instanceof CommandSourceStack) { + if (source instanceof CommandSourceStack) {
+ try { + try {
@ -48,7 +48,7 @@
+ ((CommandSourceStack) source).currentCommand.remove(Thread.currentThread()); // Paper - Thread Safe Vanilla Command permission checking + ((CommandSourceStack) source).currentCommand.remove(Thread.currentThread()); // Paper - Thread Safe Vanilla Command permission checking
+ } + }
+ } + }
+ // Paper end + // CraftBukkit end
return requirement.test(source); return requirement.test(source);
} }

8
paper-server/patches/sources/net/minecraft/core/cauldron/CauldronInteraction.java.patch
View File

@ -227,7 +227,7 @@
) { ) {
return (InteractionResult)(isUnderWater(level, pos) return (InteractionResult)(isUnderWater(level, pos)
? InteractionResult.CONSUME ? InteractionResult.CONSUME
@@ -269,50 +_,65 @@ @@ -269,53 +_,68 @@
hand, hand,
filledStack, filledStack,
Blocks.POWDER_SNOW_CAULDRON.defaultBlockState().setValue(LayeredCauldronBlock.LEVEL, Integer.valueOf(3)), Blocks.POWDER_SNOW_CAULDRON.defaultBlockState().setValue(LayeredCauldronBlock.LEVEL, Integer.valueOf(3)),
@ -298,4 +298,8 @@
+ // CraftBukkit end + // CraftBukkit end
stack.remove(DataComponents.DYED_COLOR); stack.remove(DataComponents.DYED_COLOR);
player.awardStat(Stats.CLEAN_ARMOR); player.awardStat(Stats.CLEAN_ARMOR);
LayeredCauldronBlock.lowerFillLevel(state, level, pos); - LayeredCauldronBlock.lowerFillLevel(state, level, pos);
+ // LayeredCauldronBlock.lowerFillLevel(state, level, pos); // CraftBukkit
}
return InteractionResult.SUCCESS;