From d9f495fc76001e66ec5f9e7725d5b42db41daf09 Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Sun, 25 Aug 2013 18:40:56 +1000 Subject: [PATCH] Assign multipart package compressor instances on demand instead of on world load. --- .../multipart/handler/EventHandler.scala | 6 ------ .../multipart/handler/PacketHandlers.scala | 18 ++++++++---------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/codechicken/multipart/handler/EventHandler.scala b/codechicken/multipart/handler/EventHandler.scala index f892969..d3cccb0 100644 --- a/codechicken/multipart/handler/EventHandler.scala +++ b/codechicken/multipart/handler/EventHandler.scala @@ -34,12 +34,6 @@ object MultipartEventHandler extends IConnectionHandler with ITickHandler MultipartSaveLoad.loadTiles(event.getChunk()) } - @ForgeSubscribe - def worldLoad(event:WorldEvent.Load) - { - MultipartSPH.onWorldLoad(event.world) - } - @ForgeSubscribe def worldUnLoad(event:WorldEvent.Unload) { diff --git a/codechicken/multipart/handler/PacketHandlers.scala b/codechicken/multipart/handler/PacketHandlers.scala index 3755f26..32a172a 100644 --- a/codechicken/multipart/handler/PacketHandlers.scala +++ b/codechicken/multipart/handler/PacketHandlers.scala @@ -19,7 +19,7 @@ import java.util.Map import net.minecraft.tileentity.TileEntity import codechicken.multipart.TileMultipart import net.minecraft.entity.player.EntityPlayer -import scala.collection._ +import scala.collection.mutable.{Map => MMap} import codechicken.lib.vec.BlockCoord import codechicken.lib.data.MCOutputStreamWrapper import java.io.DataOutputStream @@ -85,7 +85,7 @@ object MultipartSPH extends MultipartPH with IServerPacketHandler def getBytes = bout.toByteArray } - private val updateMap = mutable.Map[World, mutable.Map[BlockCoord, MCByteStream]]() + private val updateMap = MMap[World, MMap[BlockCoord, MCByteStream]]() def handlePacket(packet:PacketCustom, netHandler:NetServerHandler, sender:EntityPlayerMP) { @@ -95,12 +95,6 @@ object MultipartSPH extends MultipartPH with IServerPacketHandler } } - def onWorldLoad(world:World) - { - if(!world.isRemote) - updateMap.put(world, mutable.Map()) - } - def onWorldUnload(world:World) { if(!world.isRemote) @@ -108,7 +102,11 @@ object MultipartSPH extends MultipartPH with IServerPacketHandler } def getTileStream(world:World, pos:BlockCoord) = - updateMap.getOrElse(world, null).getOrElseUpdate(pos, { + updateMap.getOrElseUpdate(world, { + if(world.isRemote) + throw new IllegalArgumentException("Cannot use MultipartSPH on a client world") + MMap() + }).getOrElseUpdate(pos, { val s = new MCByteStream(new ByteArrayOutputStream) s.writeCoord(pos) s @@ -118,7 +116,7 @@ object MultipartSPH extends MultipartPH with IServerPacketHandler { players.foreach{p => val m = updateMap.getOrElse(p.worldObj, null) - if(!m.isEmpty) + if(m != null && !m.isEmpty) { val manager = p.worldObj.asInstanceOf[WorldServer].getPlayerManager val packet = new PacketCustom(channel, 3).setChunkDataPacket().compressed()