Files
CatServer/patches/net/minecraft/block/BlockDropper.java.patch
2018-09-08 09:15:34 +08:00

52 lines
2.8 KiB
Diff

--- ../src-base/minecraft/net/minecraft/block/BlockDropper.java
+++ ../src-work/minecraft/net/minecraft/block/BlockDropper.java
@@ -1,9 +1,14 @@
package net.minecraft.block;
import javax.annotation.Nullable;
+
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.event.inventory.InventoryMoveItemEvent;
+
import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
import net.minecraft.dispenser.IBehaviorDispenseItem;
import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.InventoryLargeChest;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityDispenser;
@@ -27,7 +32,7 @@
return new TileEntityDropper();
}
- protected void dispense(World worldIn, BlockPos pos)
+ public void dispense(World worldIn, BlockPos pos)
{
BlockSourceImpl blocksourceimpl = new BlockSourceImpl(worldIn, pos);
TileEntityDispenser tileentitydispenser = (TileEntityDispenser)blocksourceimpl.getBlockTileEntity();
@@ -62,9 +67,22 @@
}
else
{
- itemstack1 = TileEntityHopper.putStackInInventoryAllSlots(iinventory, itemstack.copy().splitStack(1), enumfacing.getOpposite());
+ CraftItemStack oitemstack = CraftItemStack.asCraftMirror(itemstack.copy().splitStack(1));
+ org.bukkit.inventory.Inventory destinationInventory;
+ // Have to special case large chests as they work oddly
+ if (iinventory instanceof InventoryLargeChest) {
+ destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory);
+ } else {
+ destinationInventory = iinventory.getOwner() != null ? iinventory.getOwner().getInventory() : null;
+ }
- if (itemstack1 == null)
+ InventoryMoveItemEvent event = new InventoryMoveItemEvent(tileentitydispenser.getOwner().getInventory(), oitemstack.clone(), destinationInventory, true);
+ if (destinationInventory != null) worldIn.getServer().getPluginManager().callEvent(event); // CatServer - mods bypass
+ if (event.isCancelled()) {
+ return;
+ }
+ itemstack1 = TileEntityHopper.putStackInInventoryAllSlots(iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumfacing.getOpposite());
+ if (event.getItem().equals(oitemstack) && itemstack1 == null)
{
itemstack1 = itemstack.copy();