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

client packet handler is client anyway, so getting the world instance directly from the player object should work

Browse Source
This commit is contained in:
Florian Nücke 2013-09-11 20:22:12 +02:00
parent 92d58f70c9
commit cb7d54c788
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
li/cil/oc/client/PacketHandler.scala
View File

@ -2,7 +2,6 @@ package li.cil.oc.client
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
import java.io.DataInputStream import java.io.DataInputStream
import cpw.mods.fml.common.network.IPacketHandler import cpw.mods.fml.common.network.IPacketHandler
import cpw.mods.fml.common.network.Player import cpw.mods.fml.common.network.Player
import li.cil.oc.OpenComputers import li.cil.oc.OpenComputers
@ -10,6 +9,7 @@ import li.cil.oc.client.components.Screen
import li.cil.oc.common.PacketType import li.cil.oc.common.PacketType
import net.minecraft.network.INetworkManager import net.minecraft.network.INetworkManager
import net.minecraft.network.packet.Packet250CustomPayload import net.minecraft.network.packet.Packet250CustomPayload
import net.minecraft.entity.player.EntityPlayer
/** /**
* Client side packet handler, processes packets sent from the server. * Client side packet handler, processes packets sent from the server.
@ -66,7 +66,7 @@ class PacketHandler extends IPacketHandler {
/** Utility class for packet parsing. */ /** Utility class for packet parsing. */
private class PacketParser(packet: Packet250CustomPayload, player: Player) extends DataInputStream(new ByteArrayInputStream(packet.data)) { private class PacketParser(packet: Packet250CustomPayload, player: Player) extends DataInputStream(new ByteArrayInputStream(packet.data)) {
val world = OpenComputers.proxy.getWorldForPlayer(player) val world = player.asInstanceOf[EntityPlayer].worldObj
val packetType = PacketType(readByte()) val packetType = PacketType(readByte())
def readTileEntity[T]() = { def readTileEntity[T]() = {

3
li/cil/oc/common/CommonProxy.scala
View File

@ -36,7 +36,4 @@ class CommonProxy {
// over the course of a game, since that could lead to weird effects. // over the course of a game, since that could lead to weird effects.
Drivers.locked = true Drivers.locked = true
} }
// TODO
def getWorldForPlayer(player: Player): World = null
} }