From cec8c250a9a9c058b2cac93b644fb2b6ad256f77 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Wed, 23 Nov 2016 17:01:38 +0300
Subject: [PATCH] Fixes #665 - "Block place / drop event should be called by
 the constructor"

---
 .../refinedstorage/tile/TileConstructor.java  | 32 +++++++++++++++----
 .../refinedstorage/tile/TileSolderer.java     |  1 -
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
index 165fd1f3a..efa6d7748 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
@@ -33,7 +33,12 @@ import net.minecraft.tileentity.TileEntitySkull;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.WorldServer;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.util.BlockSnapshot;
+import net.minecraftforge.common.util.FakePlayerFactory;
+import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.items.CapabilityItemHandler;
@@ -152,12 +157,20 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I
         BlockPos front = pos.offset(getDirection());
 
         if (worldObj.isAirBlock(front) && block.getBlock().canPlaceBlockAt(worldObj, front)) {
-            ItemStack took = network.extractItem(itemFilters.getStackInSlot(0), 1, compare, false);
+            ItemStack took = network.extractItem(itemFilters.getStackInSlot(0), 1, compare, true);
 
             if (took != null) {
                 @SuppressWarnings("deprecation")
                 IBlockState state = block.getBlock().getStateFromMeta(took.getMetadata());
 
+                BlockEvent.PlaceEvent e = new BlockEvent.PlaceEvent(new BlockSnapshot(worldObj, front, state), worldObj.getBlockState(pos), FakePlayerFactory.getMinecraft((WorldServer) worldObj), null);
+
+                if (MinecraftForge.EVENT_BUS.post(e)) {
+                    return;
+                }
+
+                network.extractItem(itemFilters.getStackInSlot(0), 1, compare, false);
+
                 worldObj.setBlockState(front, state, 1 | 2);
 
                 // From ItemBlock#onItemUse
@@ -166,23 +179,30 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I
 
                 if (block.getBlock() == Blocks.SKULL) {
                     worldObj.setBlockState(front, worldObj.getBlockState(front).withProperty(BlockSkull.FACING, getDirection()));
+
                     TileEntity tile = worldObj.getTileEntity(front);
+
                     if (tile instanceof TileEntitySkull) {
                         TileEntitySkull skullTile = (TileEntitySkull) tile;
+
                         if (item.getItemDamage() == 3) {
                             GameProfile playerInfo = null;
+
                             if (item.hasTagCompound()) {
-                                NBTTagCompound tagCompound = item.getTagCompound();
-                                if (tagCompound.hasKey("SkullOwner", 10)) {
-                                    playerInfo = NBTUtil.readGameProfileFromNBT(tagCompound.getCompoundTag("SkullOwner"));
-                                } else if (tagCompound.hasKey("SkullOwner", 8) && !tagCompound.getString("SkullOwner").isEmpty()) {
-                                    playerInfo = new GameProfile(null, tagCompound.getString("SkullOwner"));
+                                NBTTagCompound tag = item.getTagCompound();
+
+                                if (tag.hasKey("SkullOwner", 10)) {
+                                    playerInfo = NBTUtil.readGameProfileFromNBT(tag.getCompoundTag("SkullOwner"));
+                                } else if (tag.hasKey("SkullOwner", 8) && !tag.getString("SkullOwner").isEmpty()) {
+                                    playerInfo = new GameProfile(null, tag.getString("SkullOwner"));
                                 }
                             }
+
                             skullTile.setPlayerProfile(playerInfo);
                         } else {
                             skullTile.setType(item.getMetadata());
                         }
+
                         Blocks.SKULL.checkWitherSpawn(worldObj, front, skullTile);
                     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java
index 41a5df077..e8b8e7c79 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java
@@ -47,7 +47,6 @@ public class TileSolderer extends TileNode {
     private ItemHandlerBasic items = new ItemHandlerBasic(3, this) {
         @Override
         public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
-
             for (ISoldererRecipe recipe : API.instance().getSoldererRegistry().getRecipes()) {
                 if (API.instance().getComparer().isEqualNoQuantity(recipe.getRow(slot), stack) || API.instance().getComparer().isEqualOredict(recipe.getRow(slot), stack)) {
                     return super.insertItem(slot, stack, simulate);