diff options
| author | BlackHole <black-hole@live.com> | 2017-03-21 23:03:20 +0100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-03-22 15:15:34 +1100 |
| commit | cf05cccd1b8b96bd48474cbf6c8ddae3365d00d0 (patch) | |
| tree | 752a29611dd2cadd97120311608d49ce86592bdf /nms-patches/ItemMinecart.patch | |
| parent | 257d6cd04f7d669a4000b81ca78624f6501787c1 (diff) | |
| download | craftbukkit-cf05cccd1b8b96bd48474cbf6c8ddae3365d00d0.tar craftbukkit-cf05cccd1b8b96bd48474cbf6c8ddae3365d00d0.tar.gz craftbukkit-cf05cccd1b8b96bd48474cbf6c8ddae3365d00d0.tar.lz craftbukkit-cf05cccd1b8b96bd48474cbf6c8ddae3365d00d0.tar.xz craftbukkit-cf05cccd1b8b96bd48474cbf6c8ddae3365d00d0.zip | |
SPIGOT-3143: Don't decrease item stack size if VehicleCreateEvent is cancelled
Diffstat (limited to 'nms-patches/ItemMinecart.patch')
| -rw-r--r-- | nms-patches/ItemMinecart.patch | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nms-patches/ItemMinecart.patch b/nms-patches/ItemMinecart.patch index 2a92f8c0..60c5b2e5 100644 --- a/nms-patches/ItemMinecart.patch +++ b/nms-patches/ItemMinecart.patch @@ -50,10 +50,20 @@ entityminecartabstract.setCustomName(itemstack.getName()); } - world.addEntity(entityminecartabstract); +- world.addEntity(entityminecartabstract); - itemstack.subtract(1); ++ if (!world.addEntity(entityminecartabstract)) itemstack.add(1); + // itemstack.subtract(1); // CraftBukkit - handled during event processing + // CraftBukkit end return itemstack; } +@@ -83,7 +117,7 @@ + entityminecartabstract.setCustomName(itemstack.getName()); + } + +- world.addEntity(entityminecartabstract); ++ if (!world.addEntity(entityminecartabstract)) return EnumInteractionResult.PASS; // CraftBukkit + } + + itemstack.subtract(1); |