3rdparty/peytonplayz585-a1.2.6
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more server-side bugs

Browse Source
This commit is contained in:
PeytonPlayz595 2024-04-26 19:38:00 -04:00
parent 9d5a1e7d1b
commit 4a8dc72374
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
minecraft_server/src/net/minecraft/src/NetworkManager.java
View File

@ -94,7 +94,9 @@ public class NetworkManager {
Packet.writePacket(var2, yee); Packet.writePacket(var2, yee);
yee.flush(); yee.flush();
try { try {
socketOutputStream.write(sendBuffer.toByteArray()); if(this.isConnectionOpen()) {
socketOutputStream.write(sendBuffer.toByteArray());
}
} catch(SocketException e) { } catch(SocketException e) {
if (e.getMessage().contains("connection abort") || e.getMessage().contains("connection reset")) { if (e.getMessage().contains("connection abort") || e.getMessage().contains("connection reset")) {
this.networkShutdown("Connection reset"); this.networkShutdown("Connection reset");
@ -105,7 +107,9 @@ public class NetworkManager {
} }
} }
sendBuffer.flush(); sendBuffer.flush();
socketOutputStream.flush(); if(this.isConnectionOpen()) {
socketOutputStream.flush();
}
} catch(Exception e) { } catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
this.sendQueueByteLength = oldSendQueue; this.sendQueueByteLength = oldSendQueue;
@ -128,7 +132,9 @@ public class NetworkManager {
Packet.writePacket(var2, yee); Packet.writePacket(var2, yee);
yee.flush(); yee.flush();
try { try {
socketOutputStream.write(sendBuffer.toByteArray()); if(this.isConnectionOpen()) {
socketOutputStream.write(sendBuffer.toByteArray());
}
} catch(SocketException e) { } catch(SocketException e) {
if (e.getMessage().contains("connection abort") || e.getMessage().contains("connection reset")) { if (e.getMessage().contains("connection abort") || e.getMessage().contains("connection reset")) {
this.networkShutdown("Connection reset"); this.networkShutdown("Connection reset");
@ -139,7 +145,9 @@ public class NetworkManager {
} }
} }
sendBuffer.flush(); sendBuffer.flush();
socketOutputStream.flush(); if(this.isConnectionOpen()) {
socketOutputStream.flush();
}
this.chunkDataSendCounter = 50; this.chunkDataSendCounter = 50;
} catch(Exception e) { } catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -317,7 +325,7 @@ public class NetworkManager {
} }
boolean isConnectionOpen() { boolean isConnectionOpen() {
return networkSocket.isConnected(); return networkSocket != null && networkSocket.isConnected();
} }
static Thread getReadThread(NetworkManager var0) { static Thread getReadThread(NetworkManager var0) {
@ -336,7 +344,7 @@ public class NetworkManager {
byte[] data = bytesRead == buffer.length ? buffer : new byte[bytesRead]; byte[] data = bytesRead == buffer.length ? buffer : new byte[bytesRead];
System.arraycopy(buffer, 0, data, 0, data.length); System.arraycopy(buffer, 0, data, 0, data.length);
return new ByteArrayInputStream(data); return new ByteArrayInputStream(data);
} catch (Exception e) { } catch (Throwable e) {
return null; return null;
} }
} }