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

Properly send viewport size in text buffer init, should fix #1609.

Browse Source
This commit is contained in:
Florian Nücke 2016-01-31 17:13:35 +01:00
parent 969e6ebf94
commit ac64edd1c7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/li/cil/oc/client/PacketHandler.scala
View File

@ -7,7 +7,8 @@ import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent
import li.cil.oc.Localization import li.cil.oc.Localization
import li.cil.oc.Settings import li.cil.oc.Settings
import li.cil.oc.api import li.cil.oc.api
import li.cil.oc.api.event.{NetworkActivityEvent, FileSystemAccessEvent} import li.cil.oc.api.event.FileSystemAccessEvent
import li.cil.oc.api.event.NetworkActivityEvent
import li.cil.oc.client.renderer.PetRenderer import li.cil.oc.client.renderer.PetRenderer
import li.cil.oc.common.Loot import li.cil.oc.common.Loot
import li.cil.oc.common.PacketType import li.cil.oc.common.PacketType
@ -550,6 +551,11 @@ object PacketHandler extends CommonPacketHandler {
val maxHeight = nbt.getInteger("maxHeight") val maxHeight = nbt.getInteger("maxHeight")
buffer.setMaximumResolution(maxWidth, maxHeight) buffer.setMaximumResolution(maxWidth, maxHeight)
} }
if (nbt.hasKey("viewportWidth")) {
val viewportWidth = nbt.getInteger("viewportWidth")
val viewportHeight = nbt.getInteger("viewportHeight")
buffer.setViewport(viewportWidth, viewportHeight)
}
buffer.data.load(nbt) buffer.data.load(nbt)
buffer.proxy.markDirty() buffer.proxy.markDirty()
buffer.markInitialized() buffer.markInitialized()

2
src/main/scala/li/cil/oc/server/PacketHandler.scala
View File

@ -262,6 +262,8 @@ object PacketHandler extends CommonPacketHandler {
buffer.data.save(nbt) buffer.data.save(nbt)
nbt.setInteger("maxWidth", buffer.getMaximumWidth) nbt.setInteger("maxWidth", buffer.getMaximumWidth)
nbt.setInteger("maxHeight", buffer.getMaximumHeight) nbt.setInteger("maxHeight", buffer.getMaximumHeight)
nbt.setInteger("viewportWidth", buffer.getViewportWidth)
nbt.setInteger("viewportHeight", buffer.getViewportHeight)
PacketSender.sendTextBufferInit(address, nbt, entity) PacketSender.sendTextBufferInit(address, nbt, entity)
} }
case _ => // Invalid packet. case _ => // Invalid packet.