mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-24 18:07:39 +01:00
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.
This commit is contained in:
parent
c710ca827f
commit
4d5894e4cb
@ -106,7 +106,14 @@ public class NetServerHandler extends NetHandler {
|
||||
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
|
||||
if ((long) this.f - this.l > 20L) {
|
||||
this.l = (long) this.f;
|
||||
|
@ -485,7 +485,12 @@ public final class CraftServer implements Server {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
try {
|
||||
return dispatchCommand(sender, serverCommand.command);
|
||||
} catch (Exception ex) {
|
||||
getLogger().log(Level.WARNING, "Unexpected exception while parsing console command \"" + serverCommand.command + '"', ex);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean dispatchCommand(CommandSender sender, String commandLine) {
|
||||
|
Loading…
Reference in New Issue
Block a user