AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 18:55:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
payonel 2017-10-03 12:27:02 -07:00
commit 1659af29b0
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/li/cil/oc/common/inventory/ItemStackInventory.scala
View File

@ -12,8 +12,11 @@ trait ItemStackInventory extends Inventory {
override def items = inventory override def items = inventory
// Initialize the list automatically if we have a container. // Initialize the list automatically if we have a container.
if (!container.isEmpty) { {
reinitialize() val _container = container
if (_container != null && !_container.isEmpty) {
reinitialize()
}
} }
// Load items from tag. // Load items from tag.

12
src/main/scala/li/cil/oc/server/agent/Player.scala
View File

@ -213,12 +213,22 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc
private var offHand: (IInventory, Int) = _ private var offHand: (IInventory, Int) = _
override def setItemStackToSlot(slotIn: EntityEquipmentSlot, stack: ItemStack): Unit = { override def setItemStackToSlot(slotIn: EntityEquipmentSlot, stack: ItemStack): Unit = {
var superCall: () => Unit = () => super.setItemStackToSlot(slotIn, stack)
if (slotIn == EntityEquipmentSlot.MAINHAND) { if (slotIn == EntityEquipmentSlot.MAINHAND) {
agent.equipmentInventory.setInventorySlotContents(0, stack) agent.equipmentInventory.setInventorySlotContents(0, stack)
superCall = () => {
val slot = inventory.currentItem
// So, if we're not in the main inventory, currentItem is set to -1
// for compatibility with mods that try accessing the inv directly
// using inventory.currentItem. See li.cil.oc.server.agent.Inventory
if(inventory.currentItem < 0) inventory.currentItem = ~inventory.currentItem
super.setItemStackToSlot(slotIn, stack)
inventory.currentItem = slot
}
} else if(slotIn == EntityEquipmentSlot.OFFHAND && offHand != null) { } else if(slotIn == EntityEquipmentSlot.OFFHAND && offHand != null) {
offHand._1.setInventorySlotContents(offHand._2, stack) offHand._1.setInventorySlotContents(offHand._2, stack)
} }
super.setItemStackToSlot(slotIn, stack) superCall()
} }
override def getItemStackFromSlot(slotIn: EntityEquipmentSlot): ItemStack = { override def getItemStackFromSlot(slotIn: EntityEquipmentSlot): ItemStack = {