diff options
author | Wesley Wolfe <weswolf@aol.com> | 2012-09-09 23:19:28 -0500 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2012-09-09 23:19:28 -0500 |
commit | e2b1514daf678d8ea95a71af8bbb2a9b8efb3440 (patch) | |
tree | e6ef9925375e2c422f8c067c505a86179304168f /src/main/java/net/minecraft/server/NetServerHandler.java | |
parent | b1f6d16bfafd79d5b504e96b2b5e767de3acf227 (diff) | |
download | craftbukkit-e2b1514daf678d8ea95a71af8bbb2a9b8efb3440.tar craftbukkit-e2b1514daf678d8ea95a71af8bbb2a9b8efb3440.tar.gz craftbukkit-e2b1514daf678d8ea95a71af8bbb2a9b8efb3440.tar.lz craftbukkit-e2b1514daf678d8ea95a71af8bbb2a9b8efb3440.tar.xz craftbukkit-e2b1514daf678d8ea95a71af8bbb2a9b8efb3440.zip |
Bulk pending cleanup.
Diffstat (limited to 'src/main/java/net/minecraft/server/NetServerHandler.java')
-rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index f11d2b27..41e77727 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -105,16 +105,9 @@ public class NetServerHandler extends NetHandler { public void d() { this.h = false; ++this.f; - // this.minecraftServer.methodProfiler.a("packetflow"); // CraftBukkit - not in production code - // CraftBukkit start - try { - this.networkManager.b(); - } catch (Exception ex) { - logger.log(Level.WARNING, "Exception from " + this.player.name, ex); - this.disconnect(ex.getClass().getName()); - } - // CraftBukkit end - // this.minecraftServer.methodProfiler.c("keepAlive"); // CraftBukkit - not in production code + this.minecraftServer.methodProfiler.a("packetflow"); + this.networkManager.b(); + this.minecraftServer.methodProfiler.c("keepAlive"); if ((long) this.f - this.l > 20L) { this.l = (long) this.f; this.j = System.nanoTime() / 1000000L; @@ -130,7 +123,7 @@ public class NetServerHandler extends NetHandler { --this.x; } - // this.minecraftServer.methodProfiler.c("playerTick"); // CraftBukkit - not in production code + this.minecraftServer.methodProfiler.c("playerTick"); if (!this.h && !this.player.viewingCredits) { this.player.g(); if (this.player.vehicle == null) { @@ -138,7 +131,7 @@ public class NetServerHandler extends NetHandler { } } - // this.minecraftServer.methodProfiler.b(); // CraftBukkit - not in production code + this.minecraftServer.methodProfiler.b(); } public void disconnect(String s) { |