diff options
author | Wesley Wolfe <weswolf@aol.com> | 2012-09-06 22:11:17 -0500 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2012-09-06 22:11:17 -0500 |
commit | 4d5894e4cb29bfa4f9bb07edfb85f57363a8866e (patch) | |
tree | 9713cc1c47fb6092e6b7af10b3a951e715f1ad2f /src/main/java/net/minecraft/server | |
parent | c710ca827f6a58b9464a94945f0e3b54e83fabbd (diff) | |
download | craftbukkit-4d5894e4cb29bfa4f9bb07edfb85f57363a8866e.tar craftbukkit-4d5894e4cb29bfa4f9bb07edfb85f57363a8866e.tar.gz craftbukkit-4d5894e4cb29bfa4f9bb07edfb85f57363a8866e.tar.lz craftbukkit-4d5894e4cb29bfa4f9bb07edfb85f57363a8866e.tar.xz craftbukkit-4d5894e4cb29bfa4f9bb07edfb85f57363a8866e.zip |
Fix crash from console-commands throwing exception. Fixes BUKKIT-2479
When 1.3.1 was released, a try-catch block was removed from the tick
loop that called the method in NMS to handle commands. This restores a
try-catch to prevent the console from crashing the server.
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 6087692c..f11d2b27 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -106,7 +106,14 @@ public class NetServerHandler extends NetHandler { this.h = false; ++this.f; // this.minecraftServer.methodProfiler.a("packetflow"); // CraftBukkit - not in production code - this.networkManager.b(); + // 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 if ((long) this.f - this.l > 20L) { this.l = (long) this.f; |