Disabled updatenames int he isntall scripts till MCP fixes the reobf issue.

Updated to MLMP 1.1v2, Which says it fixes bugs it doesn't But it does fix the packet bug.
Fixed a bug in Packet 250.
This commit is contained in:
LexManos 2012-01-20 18:44:00 +00:00
parent 52a18ab02b
commit 86a5cfd48b
6 changed files with 28 additions and 35 deletions

View File

@ -49,6 +49,7 @@ popd >nul
xcopy /Y /E forge\src\* src
cmd /C updatemcp.bat
cmd /C updatenames.bat
rem Removed until MCP's Update Names is fixed
rem cmd /C updatemcp.bat
rem cmd /C updatenames.bat
cmd /C updatemd5.bat

View File

@ -53,7 +53,7 @@ popd > /dev/null
cp -r forge/src/* src
./updatemcp.sh
./updatenames.sh
# Removed until MCP's UpdateNames Is fixed
#./updatemcp.sh
#./updatenames.sh
./updatemd5.sh

View File

@ -1,15 +0,0 @@
--- ../src_base/minecraft/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000
@@ -71,7 +71,11 @@
}));
}
byte abyte0[] = new byte[k1];
- datainputstream.read(abyte0, 0, k1);
+ int bytesRead = 0;
+ while (bytesRead < k1)
+ {
+ bytesRead += datainputstream.read(abyte0, bytesRead, k1 - bytesRead);
+ }
dataString[j1] = new String(abyte0);
}
}

View File

@ -0,0 +1,11 @@
--- ../src_base/minecraft/net/minecraft/src/Packet250CustomPayload.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft/net/minecraft/src/Packet250CustomPayload.java 0000-00-00 00:00:00.000000000 -0000
@@ -20,7 +20,7 @@
if (length > 0 && length < 32767)
{
data = new byte[length];
- datainputstream.read(data);
+ datainputstream.readFully(data);
}
}

View File

@ -1,15 +0,0 @@
--- ../src_base/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000
@@ -74,7 +74,11 @@
}));
}
byte abyte0[] = new byte[k1];
- datainputstream.read(abyte0, 0, k1);
+ int bytesRead = 0;
+ while (bytesRead < k1)
+ {
+ bytesRead += datainputstream.read(abyte0, bytesRead, k1 - bytesRead);
+ }
dataString[j1] = new String(abyte0);
}
}

View File

@ -0,0 +1,11 @@
--- ../src_base/minecraft_server/net/minecraft/src/Packet250CustomPayload.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft_server/net/minecraft/src/Packet250CustomPayload.java 0000-00-00 00:00:00.000000000 -0000
@@ -20,7 +20,7 @@
if (length > 0 && length < 32767)
{
data = new byte[length];
- datainputstream.read(data);
+ datainputstream.readFully(data);
}
}