3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-29 17:40:09 +01:00
Paper/nms-patches/ItemMinecart.patch

75 Zeilen
3.5 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/ItemMinecart.java
+++ b/net/minecraft/server/ItemMinecart.java
2015-02-26 23:41:06 +01:00
@@ -1,5 +1,10 @@
package net.minecraft.server;
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.event.block.BlockDispenseEvent;
+// CraftBukkit end
+
public class ItemMinecart extends Item {
private static final IDispenseBehavior a = new DispenseBehaviorItem() {
2019-04-23 04:00:00 +02:00
@@ -38,14 +43,43 @@
2015-02-26 23:41:06 +01:00
}
}
- EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, d0, d1 + d3, d2, ((ItemMinecart) itemstack.getItem()).b);
+ // CraftBukkit start
+ // EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, d0, d1 + d3, d2, ((ItemMinecart) itemstack.getItem()).b);
2015-07-30 08:56:52 +02:00
+ ItemStack itemstack1 = itemstack.cloneAndSubtract(1);
2015-02-26 23:41:06 +01:00
+ org.bukkit.block.Block block2 = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
+ CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
+
+ BlockDispenseEvent event = new BlockDispenseEvent(block2, craftItem.clone(), new org.bukkit.util.Vector(d0, d1 + d3, d2));
+ if (!BlockDispenser.eventFired) {
+ world.getServer().getPluginManager().callEvent(event);
+ }
+
+ if (event.isCancelled()) {
2016-11-17 02:41:03 +01:00
+ itemstack.add(1);
2015-02-26 23:41:06 +01:00
+ return itemstack;
+ }
+
+ if (!event.getItem().equals(craftItem)) {
2016-11-17 02:41:03 +01:00
+ itemstack.add(1);
2015-02-26 23:41:06 +01:00
+ // Chain to handler for new item
+ ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
2015-07-30 08:56:52 +02:00
+ IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.REGISTRY.get(eventStack.getItem());
+ if (idispensebehavior != IDispenseBehavior.NONE && idispensebehavior != this) {
2018-07-15 02:00:00 +02:00
+ idispensebehavior.dispense(isourceblock, eventStack);
2015-02-26 23:41:06 +01:00
+ return itemstack;
+ }
+ }
+
+ itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
+ EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), ((ItemMinecart) itemstack1.getItem()).b);
if (itemstack.hasName()) {
entityminecartabstract.setCustomName(itemstack.getName());
}
- world.addEntity(entityminecartabstract);
2016-11-17 02:41:03 +01:00
- itemstack.subtract(1);
+ if (!world.addEntity(entityminecartabstract)) itemstack.add(1);
2016-11-17 02:41:03 +01:00
+ // itemstack.subtract(1); // CraftBukkit - handled during event processing
2015-02-26 23:41:06 +01:00
+ // CraftBukkit end
return itemstack;
}
2019-04-23 04:00:00 +02:00
@@ -87,7 +121,12 @@
entityminecartabstract.setCustomName(itemstack.getName());
}
- world.addEntity(entityminecartabstract);
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPlaceEvent(itemactioncontext, entityminecartabstract).isCancelled()) {
+ return EnumInteractionResult.FAIL;
+ }
+ // CraftBukkit end
+ if (!world.addEntity(entityminecartabstract)) return EnumInteractionResult.PASS; // CraftBukkit
}
itemstack.subtract(1);