twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Run the chat callback on the main thread as expected (#9935)

Browse Source
This commit is contained in:
Jake Potrebic
2023-11-11 15:33:19 -08:00
parent 776cc1199a
commit bbd013be54
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/Adventure.patch
View File

@@ -1683,10 +1683,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- Component component = chatDecorator.decorate(source.getPlayer(), message.decoratedContent()); - Component component = chatDecorator.decorate(source.getPlayer(), message.decoratedContent());
- callback.accept(message.withUnsignedContent(component)); - callback.accept(message.withUnsignedContent(component));
+ // Paper start + // Paper start
+ CompletableFuture<ChatDecorator.Result> componentFuture = chatDecorator.decorate(source.getPlayer(), source, message.decoratedContent()); + source.getChatMessageChainer().append(executor -> {
+ componentFuture.thenAcceptAsync((result) -> { + CompletableFuture<ChatDecorator.Result> componentFuture = chatDecorator.decorate(source.getPlayer(), source, message.decoratedContent());
+ callback.accept(message.withUnsignedContent(result.component())); + return componentFuture.thenAcceptAsync((result) -> {
+ }, source.getServer().chatExecutor); + callback.accept(message.withUnsignedContent(result.component()));
+ }, executor);
+ });
+ // Paper end + // Paper end
} }