Update to Minecraft 1.14.4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-07-20 09:00:00 +10:00
parent fa576e3e73
commit a4b8e8ce68
102 changed files with 678 additions and 751 deletions

View File

@@ -160,7 +160,7 @@
}
}
@@ -529,14 +599,45 @@
@@ -534,14 +604,45 @@
@Override
public String getPlugins() {
@@ -195,20 +195,20 @@
public String executeRemoteCommand(String s) {
this.remoteControlCommandListener.clearMessages();
this.executeSync(() -> {
- this.getCommandDispatcher().a(this.remoteControlCommandListener.f(), s);
- this.getCommandDispatcher().a(this.remoteControlCommandListener.getWrapper(), s);
+ // CraftBukkit start - fire RemoteServerCommandEvent
+ RemoteServerCommandEvent event = new RemoteServerCommandEvent(remoteConsole, s);
+ server.getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ return;
+ }
+ ServerCommand serverCommand = new ServerCommand(event.getCommand(), remoteControlCommandListener.f());
+ ServerCommand serverCommand = new ServerCommand(event.getCommand(), remoteControlCommandListener.getWrapper());
+ server.dispatchServerCommand(remoteConsole, serverCommand);
+ // CraftBukkit end
});
return this.remoteControlCommandListener.getMessages();
}
@@ -557,4 +658,16 @@
@@ -562,4 +663,16 @@
public boolean b(GameProfile gameprofile) {
return false;
}