Bug fix: Server.Client.nextLine left newlines at starts of lines

2 files changed, 9 insertions, 2 deletions

diff --git a/src/main/scala/Server/Client.scala b/src/main/scala/Server/Client.scala
index d4f1864..7c7a786 100644
--- a/src/main/scala/Server/Client.scala
+++ b/src/main/scala/Server/Client.scala
@@ -99,7 +99,12 @@ class Client(val socket: Socket):
 		if this.incompleteMessage(nextCRLF + 1) != CRLF(1) then nextCRLF = -1
 		if nextCRLF != -1 then
 			val message = this.incompleteMessage.take(nextCRLF)
-			val rest = this.incompleteMessage.drop(nextCRLF + 1)
+			val rest = this.incompleteMessage.drop(nextCRLF + 2)
+			assert(rest.headOption != Some(CRLF(1))) // I will compile this with
+			                                         // assertions off... I'd
+			                                         // like to know how to make
+			                                         // tests work with this
+			                                         // config...
 			this.incompleteMessage = rest ++ Array.fill(nextCRLF + 1)(0.toByte)
 			// TODO: the conversion may probably be exploited to crash the server
 			Some(String(message))
diff --git a/src/main/scala/Server/Server.scala b/src/main/scala/Server/Server.scala
index 230fe59..4a984a5 100644
--- a/src/main/scala/Server/Server.scala
+++ b/src/main/scala/Server/Server.scala
@@ -104,7 +104,9 @@ class Server(
 	private def writeObservations(): Unit =
 		this.clients.foreach(c =>
 			val observations = c.player.map(_.readAndClearObservations())
-			observations.foreach(_.foreach((s: String) => this.writeToClient(s"$s\r\n", c)))
+			observations.foreach(_.foreach((s: String) =>
+				this.writeToClient(s"$ACTION_NONBLOCKING_INDICATOR$s\r\n", c))
+			)
 		)
 
 	/** Helper function to determine if the next turn can be taken */