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

Made ScoreboardValue properly persist.

Browse Source
This commit is contained in:
Florian Nücke 2016-12-11 11:37:31 +01:00
parent 2e440d09a0
commit 988f4e5b85
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/scala/li/cil/oc/server/component/DebugCard.scala
View File

@ -133,7 +133,7 @@ class DebugCard(host: EnvironmentHost) extends prefab.ManagedEnvironment {
@Callback(doc = """function():userdata -- Get the scoreboard object for the world""")
def getScoreboard(context: Context, args: Arguments): Array[AnyRef] = {
checkAccess()
result(new DebugCard.ScoreboardValue(host.world.getScoreboard()))
result(new DebugCard.ScoreboardValue(Option(host.world)))
}
@Callback(doc = """function(name:string):boolean -- Get whether a mod or API is loaded.""")
@ -396,8 +396,11 @@ object DebugCard {
}
}
class ScoreboardValue(var scoreboard: Scoreboard)(implicit var ctx: Option[AccessContext]) extends prefab.AbstractValue {
def this() = this(null)(None) // For loading.
class ScoreboardValue(world: Option[World])(implicit var ctx: Option[AccessContext]) extends prefab.AbstractValue {
var scoreboard = world.fold(null: Scoreboard)(_.getScoreboard)
var dimension = world.fold(0)(_.provider.getDimension)
def this() = this(None)(None) // For loading.
@Callback(doc = """function(team:string) - Add a team to the scoreboard""")
def addTeam(context: Context, args: Arguments): Array[AnyRef] = {
@ -506,10 +509,19 @@ object DebugCard {
// ----------------------------------------------------------------------- //
private final val DimensionTag = "dimension"
override def load(nbt: NBTTagCompound) {
super.load(nbt)
ctx = AccessContext.load(nbt)
scoreboard = DimensionManager.getWorld(0).getScoreboard()
dimension = nbt.getInteger(DimensionTag)
scoreboard = DimensionManager.getWorld(dimension).getScoreboard
}
override def save(nbt: NBTTagCompound): Unit = {
super.save(nbt)
ctx.foreach(_.save(nbt))
nbt.setInteger(DimensionTag, dimension)
}
}