SPIGOT-3143: Don't decrease item stack size if VehicleCreateEvent is cancelled

By: BlackHole <black-hole@live.com>
2017-03-21 23:03:20 +01:00
parent b18c5c741b
commit c839929065
3 changed files with 22 additions and 2 deletions
--- a/paper-server/nms-patches/ItemBoat.patch
+++ b/paper-server/nms-patches/ItemBoat.patch
@@ -14,3 +14,12 @@
                 Block block = world.getType(movingobjectposition.a()).getBlock();
                 boolean flag1 = block == Blocks.WATER || block == Blocks.FLOWING_WATER;
                 EntityBoat entityboat = new EntityBoat(world, movingobjectposition.pos.x, flag1 ? movingobjectposition.pos.y - 0.12D : movingobjectposition.pos.y, movingobjectposition.pos.z);
+@@ -66,7 +73,7 @@
+                     return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
+                 } else {
+                     if (!world.isClientSide) {
+-                        world.addEntity(entityboat);
+                        if (!world.addEntity(entityboat)) return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack); // CraftBukkit
+                     }
+ 
+                     if (!entityhuman.abilities.canInstantlyBuild) {