Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-19 14:51:27 +01:00
Code Issues Projects Releases Wiki Activity

fix #5292 with help from @JRoy

Browse Source
This commit is contained in:
Riley Park 2021-03-02 08:39:36 -08:00
parent c0db0192b2
commit b24a51c0e3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Spigot-Server-Patches/Adventure.patch
View File

@ -116,6 +116,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import io.papermc.paper.event.player.AbstractChatEvent; +import io.papermc.paper.event.player.AbstractChatEvent;
+import io.papermc.paper.event.player.AsyncChatEvent; +import io.papermc.paper.event.player.AsyncChatEvent;
+import io.papermc.paper.event.player.ChatEvent; +import io.papermc.paper.event.player.ChatEvent;
+import java.util.Set;
+import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer; +import java.util.function.Consumer;
+import java.util.regex.Pattern; +import java.util.regex.Pattern;
@ -171,6 +172,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ event -> { + event -> {
+ final AsyncChatEvent ae = this.createAsync( + final AsyncChatEvent ae = this.createAsync(
+ legacyFormatter(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage()), + legacyFormatter(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage()),
+ event.getRecipients(),
+ PaperAdventure.LEGACY_SECTION_UXRC.deserialize(event.getMessage()) + PaperAdventure.LEGACY_SECTION_UXRC.deserialize(event.getMessage())
+ ); + );
+ ae.setCancelled(event.isCancelled()); // propagate cancelled state + ae.setCancelled(event.isCancelled()); // propagate cancelled state
@ -188,6 +190,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ protected Void evaluate() { + protected Void evaluate() {
+ final ChatEvent se = ChatProcessor.this.createSync( + final ChatEvent se = ChatProcessor.this.createSync(
+ legacyFormatter(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage()), + legacyFormatter(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage()),
+ event.getRecipients(),
+ PaperAdventure.LEGACY_SECTION_UXRC.deserialize(event.getMessage()) + PaperAdventure.LEGACY_SECTION_UXRC.deserialize(event.getMessage())
+ ); + );
+ se.setCancelled(event.isCancelled()); // propagate cancelled state + se.setCancelled(event.isCancelled()); // propagate cancelled state
@ -199,7 +202,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }, + },
+ // no legacy events called, all nice and fresh! + // no legacy events called, all nice and fresh!
+ () -> { + () -> {
+ final AsyncChatEvent ae = this.createAsync(ChatFormatter.DEFAULT, Component.text(this.message).replaceText(URL_REPLACEMENT_CONFIG)); + final AsyncChatEvent ae = this.createAsync(ChatFormatter.DEFAULT, new LazyPlayerSet(this.server), Component.text(this.message).replaceText(URL_REPLACEMENT_CONFIG));
+ post(ae); + post(ae);
+ if (listenersOnSyncEvent) { + if (listenersOnSyncEvent) {
+ this.continueWithSyncFromWhereAsyncLeftOff(ae); + this.continueWithSyncFromWhereAsyncLeftOff(ae);
@ -222,7 +225,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ this.queueIfAsyncOrRunImmediately(new Waitable<Void>() { + this.queueIfAsyncOrRunImmediately(new Waitable<Void>() {
+ @Override + @Override
+ protected Void evaluate() { + protected Void evaluate() {
+ final ChatEvent se = ChatProcessor.this.createSync(ae.formatter(), ae.message()); + final ChatEvent se = ChatProcessor.this.createSync(ae.formatter(), ae.recipients(), ae.message());
+ se.setCancelled(ae.isCancelled()); // propagate cancelled state + se.setCancelled(ae.isCancelled()); // propagate cancelled state
+ post(se); + post(se);
+ ChatProcessor.this.complete(se); + ChatProcessor.this.complete(se);
@ -257,12 +260,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ } + }
+ +
+ private AsyncChatEvent createAsync(final ChatFormatter formatter, final Component message) { + private AsyncChatEvent createAsync(final ChatFormatter formatter, final Set<Player> recipients, final Component message) {
+ return new AsyncChatEvent(this.async, this.player.getBukkitEntity(), new LazyPlayerSet(this.server), formatter, message); + return new AsyncChatEvent(this.async, this.player.getBukkitEntity(), recipients, formatter, message);
+ } + }
+ +
+ private ChatEvent createSync(final ChatFormatter formatter, final Component message) { + private ChatEvent createSync(final ChatFormatter formatter, final Set<Player> recipients, final Component message) {
+ return new ChatEvent(this.player.getBukkitEntity(), new LazyPlayerSet(this.server), formatter, message); + return new ChatEvent(this.player.getBukkitEntity(), recipients, formatter, message);
+ } + }
+ +
+ @SuppressWarnings("deprecation") + @SuppressWarnings("deprecation")