From b72d3c8f5c39e2441fd3c2bae195f95c208d8767 Mon Sep 17 00:00:00 2001
From: Reider745 <70357814+Reider745@users.noreply.github.com>
Date: Fri, 29 Mar 2024 08:38:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BA=D1=80=D0=B0=D1=88=D0=B0=20=D1=8F=D0=B4=D1=80?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../channel/data/SocketDataChannel.java       | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/channel/data/SocketDataChannel.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/channel/data/SocketDataChannel.java
index 0f6ced89..9b2b4aad 100644
--- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/channel/data/SocketDataChannel.java
+++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/channel/data/SocketDataChannel.java
@@ -21,23 +21,29 @@ public class SocketDataChannel extends DataChannel {
 
     @Override
     public void sendImpl(DataPacket packet) throws IOException {
-        outputStream.writeUTF(packet.name);
-        outputStream.writeByte(packet.formatId);
-        outputStream.writeInt(packet.data.length);
-        outputStream.write(packet.data);
+        if(socket.isClosed()) return;
+        synchronized (outputStream) {
+            outputStream.writeUTF(packet.name);
+            outputStream.writeByte(packet.formatId);
+            outputStream.writeInt(packet.data.length);
+            outputStream.write(packet.data);
+        }
     }
 
     @Override
     public DataPacket receiveImpl() throws IOException {
-        String name = inputStream.readUTF();
-        int formatId = inputStream.readByte();
-        int size = inputStream.readInt();
-        if (size < 0 || size > 1024 * 1024 * 64) {
-            throw new IOException("packet has invalid size " + size);
+        if(socket.isClosed()) return null;
+        synchronized (inputStream) {
+            String name = inputStream.readUTF();
+            int formatId = inputStream.readByte();
+            int size = inputStream.readInt();
+            if (size < 0 || size > 1024 * 1024 * 64) {
+                throw new IOException("packet has invalid size " + size);
+            }
+            byte[] data = new byte[size];
+            inputStream.readFully(data);
+            return new DataPacket(name, formatId, data);
         }
-        byte[] data = new byte[size];
-        inputStream.readFully(data);
-        return new DataPacket(name, formatId, data);
     }
 
     @Override