Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-6714: Don't fire PlayerBucketEvent when empty

Browse Source
This commit is contained in:
Noah van der Aa 2021-08-18 17:06:40 +10:00 committed by md_5
parent 8c6d60cf50
commit 3cad0316e0
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nms-patches/net/minecraft/world/item/ItemBucket.patch
View File

@ -23,6 +23,7 @@
IFluidSource ifluidsource = (IFluidSource) iblockdata.getBlock(); IFluidSource ifluidsource = (IFluidSource) iblockdata.getBlock();
+ // CraftBukkit start + // CraftBukkit start
+ ItemStack dummyFluid = ifluidsource.removeFluid(DummyGeneratorAccess.INSTANCE, blockposition, iblockdata); + ItemStack dummyFluid = ifluidsource.removeFluid(DummyGeneratorAccess.INSTANCE, blockposition, iblockdata);
+ if (dummyFluid.isEmpty()) return InteractionResultWrapper.fail(itemstack); // Don't fire event if the bucket won't be filled.
+ PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((WorldServer) world, entityhuman, blockposition, blockposition, movingobjectpositionblock.getDirection(), itemstack, dummyFluid.getItem()); + PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((WorldServer) world, entityhuman, blockposition, blockposition, movingobjectpositionblock.getDirection(), itemstack, dummyFluid.getItem());
+ +
+ if (event.isCancelled()) { + if (event.isCancelled()) {