Merge branch 'master-MC1.9.4' into master-MC1.10

This commit is contained in:
Vexatos 2016-12-29 18:41:52 +01:00
commit 20af9c8cbf

View File

@ -346,7 +346,7 @@ class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends Comp
case _ => false
})
override def isUseableByPlayer(player: EntityPlayer) = machine.canInteract(player.getName)
override def isUseableByPlayer(player: EntityPlayer) = machine != null && machine.canInteract(player.getName)
override def markDirty(): Unit = {
data.save(stack)