diff options
author | md_5 <git@md-5.net> | 2017-05-19 21:00:13 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-05-19 21:00:13 +1000 |
commit | 10043529907a4ba913ebe2712876e4b1911263b8 (patch) | |
tree | 37f3cbb2527d02eac320ed0900bf92a4f3c8407c /nms-patches/DedicatedServer.patch | |
parent | 3ecbb59cbb9e20064d04628d26387742705ab9ac (diff) | |
download | craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.gz craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.lz craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.xz craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.zip |
Update to Minecraft 1.12-pre5
Diffstat (limited to 'nms-patches/DedicatedServer.patch')
-rw-r--r-- | nms-patches/DedicatedServer.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch index eb648a36..04036d24 100644 --- a/nms-patches/DedicatedServer.patch +++ b/nms-patches/DedicatedServer.patch @@ -98,7 +98,7 @@ + thread.setDaemon(true); thread.start(); - DedicatedServer.LOGGER.info("Starting minecraft server version 1.12-pre2"); + DedicatedServer.LOGGER.info("Starting minecraft server version 1.12-pre5"); @@ -79,7 +126,7 @@ } @@ -172,14 +172,14 @@ while (!this.serverCommandQueue.isEmpty()) { ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0); -- this.getCommandHandler().b(servercommand.source, servercommand.command); +- this.getCommandHandler().a(servercommand.source, servercommand.command); + // CraftBukkit start - ServerCommand for preprocessing + ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command); + server.getPluginManager().callEvent(event); + if (event.isCancelled()) continue; + servercommand = new ServerCommand(event.getCommand(), servercommand.source); + -+ // this.getCommandHandler().b(servercommand.source, servercommand.command); // Called in dispatchServerCommand ++ // this.getCommandHandler().a(servercommand.source, servercommand.command); // Called in dispatchServerCommand + server.dispatchServerCommand(console, servercommand); + // CraftBukkit end } @@ -215,7 +215,7 @@ - public String executeRemoteCommand(String s) { - this.remoteControlCommandListener.clearMessages(); -- this.b.b(this.remoteControlCommandListener, s); +- this.b.a(this.remoteControlCommandListener, s); - return this.remoteControlCommandListener.getMessages(); + return result.toString(); + // CraftBukkit end |