From ac64edd1c72519c3e38807bc344607716bfaa51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sun, 31 Jan 2016 17:13:35 +0100
Subject: [PATCH] Properly send viewport size in text buffer init, should fix
 #1609.

---
 src/main/scala/li/cil/oc/client/PacketHandler.scala | 8 +++++++-
 src/main/scala/li/cil/oc/server/PacketHandler.scala | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/li/cil/oc/client/PacketHandler.scala b/src/main/scala/li/cil/oc/client/PacketHandler.scala
index f86bf2a4f..9dca7e17b 100644
--- a/src/main/scala/li/cil/oc/client/PacketHandler.scala
+++ b/src/main/scala/li/cil/oc/client/PacketHandler.scala
@@ -7,7 +7,8 @@ import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent
 import li.cil.oc.Localization
 import li.cil.oc.Settings
 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.common.Loot
 import li.cil.oc.common.PacketType
@@ -550,6 +551,11 @@ object PacketHandler extends CommonPacketHandler {
           val maxHeight = nbt.getInteger("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.proxy.markDirty()
         buffer.markInitialized()
diff --git a/src/main/scala/li/cil/oc/server/PacketHandler.scala b/src/main/scala/li/cil/oc/server/PacketHandler.scala
index ce9b49301..c350153d2 100644
--- a/src/main/scala/li/cil/oc/server/PacketHandler.scala
+++ b/src/main/scala/li/cil/oc/server/PacketHandler.scala
@@ -262,6 +262,8 @@ object PacketHandler extends CommonPacketHandler {
               buffer.data.save(nbt)
               nbt.setInteger("maxWidth", buffer.getMaximumWidth)
               nbt.setInteger("maxHeight", buffer.getMaximumHeight)
+              nbt.setInteger("viewportWidth", buffer.getViewportWidth)
+              nbt.setInteger("viewportHeight", buffer.getViewportHeight)
               PacketSender.sendTextBufferInit(address, nbt, entity)
             }
           case _ => // Invalid packet.