AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tablets not being properly un/reloaded on dimension changes, closes #727.

Browse Source
This commit is contained in:
Florian Nücke 2014-12-11 14:21:35 +01:00
parent 58ab97142a
commit b288a63e18
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/scala/li/cil/oc/common/item/Tablet.scala
View File

@ -40,6 +40,7 @@ import net.minecraft.world.World
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.event.world.WorldEvent
import scala.collection.convert.WrapAsJava._
import scala.collection.convert.WrapAsScala._ import scala.collection.convert.WrapAsScala._
class Tablet(val parent: Delegator) extends Delegate { class Tablet(val parent: Delegator) extends Delegate {
@ -119,11 +120,16 @@ class Tablet(val parent: Delegator) extends Delegate {
} }
class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends ComponentInventory with MachineHost with internal.Tablet { class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends ComponentInventory with MachineHost with internal.Tablet {
lazy val machine = if (player.worldObj.isRemote) null else Machine.create(this) // Remember our *original* world, so we know which tablets to clear on dimension
// changes of players holding tablets - since the player entity instance may be
// kept the same and components are not required to properly handle world changes.
val world = player.worldObj
lazy val machine = if (world.isRemote) null else Machine.create(this)
val data = new TabletData() val data = new TabletData()
val tablet = if (player.worldObj.isRemote) null else new component.Tablet(this) val tablet = if (world.isRemote) null else new component.Tablet(this)
private var isInitialized = !world.isRemote private var isInitialized = !world.isRemote
@ -229,8 +235,6 @@ class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends Comp
override def zPosition = player.posZ override def zPosition = player.posZ
override def world = player.worldObj
override def markChanged() {} override def markChanged() {}
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
@ -338,8 +342,8 @@ object Tablet {
@SubscribeEvent @SubscribeEvent
def onWorldUnload(e: WorldEvent.Unload) { def onWorldUnload(e: WorldEvent.Unload) {
Client.clear() Client.clear(e.world)
Server.clear() Server.clear(e.world)
} }
@SubscribeEvent @SubscribeEvent
@ -371,7 +375,16 @@ object Tablet {
cache.synchronized { cache.synchronized {
currentStack = stack currentStack = stack
currentHolder = holder currentHolder = holder
val wrapper = cache.get(id, this) var wrapper = cache.get(id, this)
// Force re-load on world change, in case some components store a
// reference to the world object.
if (holder.worldObj != wrapper.world) {
cache.invalidate(id)
cache.cleanUp()
wrapper = cache.get(id, this)
}
wrapper.stack = stack wrapper.stack = stack
wrapper.player = holder wrapper.player = holder
wrapper wrapper
@ -395,9 +408,10 @@ object Tablet {
} }
} }
def clear() { def clear(world: World) {
cache.synchronized { cache.synchronized {
cache.invalidateAll() val tabletsInWorld = cache.asMap.filter(_._2.world == world)
cache.invalidateAll(asJavaIterable(tabletsInWorld.keys))
cache.cleanUp() cache.cleanUp()
} }
} }