Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bulk pending cleanup.

Browse Source
This commit is contained in:
Wesley Wolfe
2012-09-09 23:19:28 -05:00
parent b1f6d16bfa
commit e2b1514daf
37 changed files with 203 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/minecraft/server/NetServerHandler.java
View File

@@ -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) {