Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5884: Tab completions lost on reloadData / minecraft:reload

Browse Source
This commit is contained in:
md_5 2020-06-30 10:51:26 +10:00
parent fb4e54ad7b
commit 92cbf65649
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nms-patches/MinecraftServer.patch
View File

@ -643,7 +643,7 @@
} }
public CrashReport b(CrashReport crashreport) { public CrashReport b(CrashReport crashreport) {
@@ -1217,11 +1472,11 @@ @@ -1217,16 +1472,17 @@
public CompletableFuture<Void> a(Collection<String> collection) { public CompletableFuture<Void> a(Collection<String> collection) {
CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> { CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
@ -657,7 +657,13 @@
}, this).thenCompose((immutablelist) -> { }, this).thenCompose((immutablelist) -> {
return DataPackResources.a(immutablelist, this.j() ? CommandDispatcher.ServerType.DEDICATED : CommandDispatcher.ServerType.INTEGRATED, this.h(), this.executorService, this); return DataPackResources.a(immutablelist, this.j() ? CommandDispatcher.ServerType.DEDICATED : CommandDispatcher.ServerType.INTEGRATED, this.h(), this.executorService, this);
}).thenAcceptAsync((datapackresources) -> { }).thenAcceptAsync((datapackresources) -> {
@@ -1592,6 +1847,22 @@ this.dataPackResources.close();
this.dataPackResources = datapackresources;
+ this.server.syncCommands(); // SPIGOT-5884: Lost on reload
this.resourcePackRepository.a(collection);
this.saveData.a(a(this.resourcePackRepository));
datapackresources.i();
@@ -1592,6 +1848,22 @@
} }

2
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -429,7 +429,7 @@ public final class CraftServer implements Server {
} }
} }
private void syncCommands() { public void syncCommands() {
// Clear existing commands // Clear existing commands
CommandDispatcher dispatcher = console.dataPackResources.commandDispatcher = new CommandDispatcher(); CommandDispatcher dispatcher = console.dataPackResources.commandDispatcher = new CommandDispatcher();