xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Fix RCON

Browse Source
This commit is contained in:
Prototik 2015-05-14 23:39:15 +07:00
parent a2e007c47a
commit f4bcd6da82
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -47,7 +47,7 @@ archivesBaseName = 'kcauldron'
ext.mcVersion = "1.7.10" ext.mcVersion = "1.7.10"
ext.cauldronVersion = "3" ext.cauldronVersion = "3"
ext.forgeVersion = "1403" ext.forgeVersion = "1403"
ext.revision = "60" ext.revision = "61"
version = "${mcVersion}-${cauldronVersion}.${forgeVersion}.${revision}" version = "${mcVersion}-${cauldronVersion}.${forgeVersion}.${revision}"
launch4j { launch4j {

18
patches/net/minecraft/network/rcon/RConThreadClient.java.patch
View File

@ -1,6 +1,14 @@
--- ../src-base/minecraft/net/minecraft/network/rcon/RConThreadClient.java --- ../src-base/minecraft/net/minecraft/network/rcon/RConThreadClient.java
+++ ../src-work/minecraft/net/minecraft/network/rcon/RConThreadClient.java +++ ../src-work/minecraft/net/minecraft/network/rcon/RConThreadClient.java
@@ -52,6 +52,8 @@ @@ -45,13 +45,15 @@
{
try
{
- if (!this.running)
+ if (!this.running || clientSocket == null)
{
break;
}
BufferedInputStream bufferedinputstream = new BufferedInputStream(this.clientSocket.getInputStream()); BufferedInputStream bufferedinputstream = new BufferedInputStream(this.clientSocket.getInputStream());
int i = bufferedinputstream.read(this.buffer, 0, 1460); int i = bufferedinputstream.read(this.buffer, 0, 1460);
@ -9,3 +17,11 @@
if (10 > i) if (10 > i)
{ {
@@ -167,6 +169,7 @@
private void closeSocket()
{
+ this.running = false;
if (null != this.clientSocket)
{
try