From 60819c6693daf19dde68b04af38a4fee8c7da988 Mon Sep 17 00:00:00 2001
From: Travis Watkins <amaranth@ubuntu.com>
Date: Wed, 24 Oct 2012 22:53:23 -0500
Subject: Update CraftBukkit to Minecraft 1.4(.2).

---
 src/main/java/net/minecraft/server/Packet.java | 27 ++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'src/main/java/net/minecraft/server/Packet.java')

diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
index 380c0b96..dc692dd0 100644
--- a/src/main/java/net/minecraft/server/Packet.java
+++ b/src/main/java/net/minecraft/server/Packet.java
@@ -4,6 +4,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.EOFException;
 import java.io.IOException;
+import java.net.Socket;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -81,25 +82,30 @@ public abstract class Packet {
         return packetID; // ((Integer) a.get(this.getClass())).intValue(); // CraftBukkit
     }
 
-    public static Packet a(DataInputStream datainputstream, boolean flag) throws IOException { // CraftBukkit - throws IOException
+    public static Packet a(DataInputStream datainputstream, boolean flag, Socket socket) throws IOException { // CraftBukkit - throws IOException
         boolean flag1 = false;
         Packet packet = null;
+        int i = socket.getSoTimeout();
 
-        int i;
+        int j;
 
         try {
-            i = datainputstream.read();
-            if (i == -1) {
+            j = datainputstream.read();
+            if (j == -1) {
                 return null;
             }
 
-            if (flag && !c.contains(Integer.valueOf(i)) || !flag && !b.contains(Integer.valueOf(i))) {
-                throw new IOException("Bad packet id " + i);
+            if (flag && !c.contains(Integer.valueOf(j)) || !flag && !b.contains(Integer.valueOf(j))) {
+                throw new IOException("Bad packet id " + j);
             }
 
-            packet = d(i);
+            packet = d(j);
             if (packet == null) {
-                throw new IOException("Bad packet id " + i);
+                throw new IOException("Bad packet id " + j);
+            }
+
+            if (packet instanceof Packet254GetInfo) {
+                socket.setSoTimeout(1500);
             }
 
             packet.a(datainputstream);
@@ -121,9 +127,10 @@ public abstract class Packet {
         // CraftBukkit end
 
 
-        PacketCounter.a(i, (long) packet.a());
+        PacketCounter.a(j, (long) packet.a());
         ++n;
         o += (long) packet.a();
+        socket.setSoTimeout(i);
         return packet;
     }
 
@@ -211,7 +218,7 @@ public abstract class Packet {
             dataoutputstream.writeShort(itemstack.getData());
             NBTTagCompound nbttagcompound = null;
 
-            if (itemstack.getItem().m() || itemstack.getItem().p()) {
+            if (itemstack.getItem().n() || itemstack.getItem().q()) {
                 nbttagcompound = itemstack.tag;
             }
 
-- 
cgit v1.2.3