3
0
KCauldronX/patches/net/minecraft/network/rcon/RConThreadClient.java.patch

68 lines
1.8 KiB
Diff
Raw Normal View History

2015-03-25 05:24:42 +00:00
--- ../src-base/minecraft/net/minecraft/network/rcon/RConThreadClient.java
+++ ../src-work/minecraft/net/minecraft/network/rcon/RConThreadClient.java
2015-06-01 13:49:05 +00:00
@@ -41,20 +41,21 @@
public void run()
{
- while (true)
+ try
2015-05-14 16:39:15 +00:00
{
2015-06-01 13:49:05 +00:00
- try
2015-06-01 14:32:10 +00:00
+ while (true)
{
- if (!this.running)
2015-05-14 16:39:15 +00:00
+ if (!this.running || clientSocket == null)
{
break;
}
2015-05-08 09:29:14 +00:00
2015-03-25 05:24:42 +00:00
BufferedInputStream bufferedinputstream = new BufferedInputStream(this.clientSocket.getInputStream());
int i = bufferedinputstream.read(this.buffer, 0, 1460);
2015-06-01 13:49:05 +00:00
-
- if (10 > i)
2015-05-08 09:29:14 +00:00
+
2015-06-01 13:49:05 +00:00
+ if (i < 10)
2015-03-25 05:24:42 +00:00
{
2015-06-01 14:32:10 +00:00
+ this.running = false; // Cauldron
2015-06-01 13:49:05 +00:00
return;
}
@@ -110,26 +111,23 @@
2015-06-01 13:49:05 +00:00
}
}
}
+ }
2015-06-01 13:49:05 +00:00
catch (SocketTimeoutException sockettimeoutexception)
{
- break;
+ return;
}
catch (IOException ioexception)
{
- break;
+ return;
}
catch (Exception exception1)
{
field_164005_h.error("Exception whilst parsing RCON input", exception1);
- break;
}
finally
{
this.closeSocket();
}
-
- return;
- }
}
private void sendResponse(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException
@@ -167,6 +165,7 @@
2015-05-14 16:39:15 +00:00
private void closeSocket()
{
2015-06-01 14:32:10 +00:00
+ this.running = false;
2015-05-14 16:39:15 +00:00
if (null != this.clientSocket)
{
try