summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemMinecart.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/ItemMinecart.patch')
-rw-r--r--nms-patches/ItemMinecart.patch12
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);