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/ItemMinecart.patch
+++ b/paper-server/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);