diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-06-27 00:25:01 +0200 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-06-27 00:47:03 +0200 |
commit | a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 (patch) | |
tree | f7c9c5db09b72b57a85240cc7fdb2e4bcf7ab875 /src/main/java/net/minecraft/server/Packet.java | |
parent | 9e5dba8306f77e0583537efe7d5b3670639e3382 (diff) | |
download | craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar.gz craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar.lz craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.tar.xz craftbukkit-a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3.zip |
Massive renaming update in nms. If you bypassed Bukkit, you will likely break.
Also minimized all the nms diffs and generic cleanups all around.
Diffstat (limited to 'src/main/java/net/minecraft/server/Packet.java')
-rw-r--r-- | src/main/java/net/minecraft/server/Packet.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java index 620017eb..f83acc41 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -9,11 +9,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -// CraftBukkit start -import java.net.SocketException; -import java.net.SocketTimeoutException; -// CraftBukkit end - public abstract class Packet { private static Map a = new HashMap(); @@ -90,10 +85,10 @@ public abstract class Packet { } // CraftBukkit start - catch (SocketTimeoutException exception) { + catch (java.net.SocketTimeoutException exception) { System.out.println("Read timed out"); return null; - } catch (SocketException exception) { + } catch (java.net.SocketException exception) { System.out.println("Connection reset"); return null; } |