Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-17 04:51:36 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4369: Handle cancelled trident event

Browse Source
This commit is contained in:
md_5 2018-09-15 15:31:39 +10:00
parent bf1c82731c
commit 97315374fb
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nms-patches/ItemTrident.patch
View File

@ -14,7 +14,24 @@
} }
public boolean a(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) { public boolean a(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) {
@@ -53,6 +57,10 @@ @@ -42,7 +46,15 @@
entitythrowntrident.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
}
- world.addEntity(entitythrowntrident);
+ // CraftBukkit start
+ if (!world.addEntity(entitythrowntrident)) {
+ if (entityhuman instanceof EntityPlayer) {
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
+ }
+ return;
+ }
+ // CraftBukkit end
+
if (!entityhuman.abilities.canInstantlyBuild) {
entityhuman.inventory.f(itemstack);
}
@@ -53,6 +65,10 @@
SoundEffect soundeffect = SoundEffects.ITEM_TRIDENT_THROW; SoundEffect soundeffect = SoundEffects.ITEM_TRIDENT_THROW;
if (k > 0) { if (k > 0) {