mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
9a15789561
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172) PaperMC/Paper@5deafd1 Teleportation API (#6562)
43 lines
2.5 KiB
Diff
43 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
|
Date: Mon, 11 Jul 2022 20:44:19 -0500
|
|
Subject: [PATCH] Chat Preview API
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/chat/ChatDecorator.java b/src/main/java/net/minecraft/network/chat/ChatDecorator.java
|
|
index d07bb2d1f365cb7c92a1252b83210fa38cbeeb1d..d307fd9656c2067eb70c5031dd250dc8aabfd663 100644
|
|
--- a/src/main/java/net/minecraft/network/chat/ChatDecorator.java
|
|
+++ b/src/main/java/net/minecraft/network/chat/ChatDecorator.java
|
|
@@ -8,6 +8,18 @@ import net.minecraft.server.network.FilteredText;
|
|
@FunctionalInterface
|
|
public interface ChatDecorator {
|
|
ChatDecorator PLAIN = (sender, message) -> {
|
|
+ // Purpur start
|
|
+ if (sender != null) {
|
|
+ net.kyori.adventure.text.Component adventureComponent = io.papermc.paper.adventure.PaperAdventure.asAdventure(message);
|
|
+ org.purpurmc.purpur.event.player.PlayerPreviewChatEvent previewEvent = new org.purpurmc.purpur.event.player.PlayerPreviewChatEvent(sender.getBukkitEntity(), "", adventureComponent);
|
|
+ if (!previewEvent.callEvent()) {
|
|
+ return CompletableFuture.completedFuture(null);
|
|
+ }
|
|
+ if (!previewEvent.getQuery().equals(adventureComponent)) {
|
|
+ return CompletableFuture.completedFuture(io.papermc.paper.adventure.PaperAdventure.asVanilla(previewEvent.getQuery()));
|
|
+ }
|
|
+ }
|
|
+ // Purpur end
|
|
return CompletableFuture.completedFuture(message);
|
|
};
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index cb64b26bd1fbc267e6857a44d3b76933c431aa5f..38cd5aec3c54984c3c3429aa0bfb525ba170f116 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -2518,7 +2518,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
|
|
|
@Override
|
|
public void handleChatPreview(ServerboundChatPreviewPacket packet) {
|
|
- if (false && this.server.previewsChat()) { // CraftBukkit - preview NYI
|
|
+ if (this.server.previewsChat()) { // CraftBukkit - preview NYI // Purpur - lets implement it already.. sheesh
|
|
this.chatPreviewThrottler.schedule(() -> {
|
|
int i = packet.queryId();
|
|
String s = packet.query();
|