spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-7036: Don't use CHAT message type

Browse source
This commit is contained in:
md_5 2022-06-08 10:02:44 +10:00
parent 63a060496b
commit f343df8223
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CraftBukkit-Patches/0081-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From f89e94b4812b1449ae3912534f53eb8cbae36f8b Mon Sep 17 00:00:00 2001
From dcd46779df6556e8ae62d48b04811e83f0e77c5b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
@ -144,7 +144,7 @@ index 2b95bfe26..a4e36b96e 100644
public org.bukkit.entity.Entity.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a9a615a1e..5c066acc5 100644
index a9a615a1e..86adfa50d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -149,6 +149,8 @@ import org.bukkit.plugin.messaging.StandardMessenger;
@ -156,7 +156,7 @@ index a9a615a1e..5c066acc5 100644
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -1949,6 +1951,51 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1949,6 +1951,54 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}
@ -200,7 +200,10 @@ index a9a615a1e..5c066acc5 100644
+ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, UUID sender, BaseComponent... components) {
+ if ( getHandle().connection == null ) return;
+
+ net.minecraft.core.IRegistry<ChatMessageType> iregistry = CraftPlayer.this.getHandle().level.registryAccess().registryOrThrow(net.minecraft.core.IRegistry.CHAT_TYPE_REGISTRY);
+ // This position has client side formatting now, switch to system
+ if (position == net.md_5.bungee.api.ChatMessageType.CHAT) {
+ position = net.md_5.bungee.api.ChatMessageType.SYSTEM;
+ }
+ int i = position.ordinal();
+
+ getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(components, i));