From ebd92e094dba80444cc3b675878f77492b03bcf7 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Sat, 22 Oct 2011 11:53:00 +0000 Subject: [PATCH] Bugfix for numeric range of mob and window IDs. --- .../src/Packet100OpenWindow.java.patch | 14 +++++++++++++ .../minecraft/src/Packet24MobSpawn.java.patch | 20 +++++++++++++++++++ .../src/Packet100OpenWindow.java.patch | 14 +++++++++++++ .../minecraft/src/Packet24MobSpawn.java.patch | 20 +++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch create mode 100644 patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch create mode 100644 patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch create mode 100644 patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch diff --git a/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch b/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch new file mode 100644 index 0000000000..fc3f841a21 --- /dev/null +++ b/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch @@ -0,0 +1,14 @@ +--- ../src_base/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 +@@ -25,9 +25,9 @@ + throws IOException + { + windowId = datainputstream.readByte(); +- inventoryType = datainputstream.readByte(); ++ inventoryType = datainputstream.readByte()&0xFF; + windowTitle = readString(datainputstream, 16); +- slotsCount = datainputstream.readByte(); ++ slotsCount = datainputstream.readByte()&0xFF; + } + + public void writePacketData(DataOutputStream dataoutputstream) diff --git a/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch b/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch new file mode 100644 index 0000000000..add364620a --- /dev/null +++ b/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 +@@ -34,7 +34,7 @@ + throws IOException + { + entityId = datainputstream.readInt(); +- type = datainputstream.readByte(); ++ type = datainputstream.readByte()&0xFF; + xPosition = datainputstream.readInt(); + yPosition = datainputstream.readInt(); + zPosition = datainputstream.readInt(); +@@ -72,7 +72,7 @@ + } + + public int entityId; +- public byte type; ++ public int type; + public int xPosition; + public int yPosition; + public int zPosition; diff --git a/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch b/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch new file mode 100644 index 0000000000..c79e7b22e2 --- /dev/null +++ b/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch @@ -0,0 +1,14 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 +@@ -33,9 +33,9 @@ + throws IOException + { + windowId = datainputstream.readByte(); +- inventoryType = datainputstream.readByte(); ++ inventoryType = datainputstream.readByte()&0xFF; + windowTitle = readString(datainputstream, 16); +- slotsCount = datainputstream.readByte(); ++ slotsCount = datainputstream.readByte()&0xFF; + } + + public void writePacketData(DataOutputStream dataoutputstream) diff --git a/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch b/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch new file mode 100644 index 0000000000..b024e03f0d --- /dev/null +++ b/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 +@@ -34,7 +34,7 @@ + throws IOException + { + entityId = datainputstream.readInt(); +- type = datainputstream.readByte(); ++ type = datainputstream.readByte()&0xFF; + xPosition = datainputstream.readInt(); + yPosition = datainputstream.readInt(); + zPosition = datainputstream.readInt(); +@@ -67,7 +67,7 @@ + } + + public int entityId; +- public byte type; ++ public int type; + public int xPosition; + public int yPosition; + public int zPosition;