Refactor Spigot's patch in TileEntity. Fixes #1434