Merge branch 'master-MC1.11' into master-MC1.12

This commit is contained in:
payonel 2018-03-20 12:36:03 -07:00
commit ba725c03b5

View File

@ -493,7 +493,7 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc
private def callUsingItemInSlot[T](inventory: IInventory, slot: Int, f: (ItemStack) => T, repair: Boolean = true) = {
val itemsBefore = adjacentItems
val stack = inventory.getStackInSlot(slot)
val oldStack = if (!stack.isEmpty) stack.copy() else null
val oldStack = stack.copy()
this.inventory.currentItem = if (inventory == agent.mainInventory) slot else ~slot
this.offHand = (inventory, slot)
try {