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

Fix String based Action Bar to use ChatComponent to handle proper escaping

Browse Source
This commit is contained in:
Aikar
2016-12-29 08:29:09 -05:00
parent 04c621bb48
commit 2c5f074c1d
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/String-based-Action-Bar-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] String based Action Bar API
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
index fe7b476c0..117cfba80 100644
index 1159eea1a..38359517c 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -0,0 +0,0 @@
@@ -46,7 +46,7 @@ index fe7b476c0..117cfba80 100644
+ }
/**
* Builds a chat componenent from a string.
* Ensures the target code is running on the main thread
@@ -0,0 +0,0 @@ public final class MCUtil {
}
return null;
@@ -62,7 +62,7 @@ index fe7b476c0..117cfba80 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3edeb4910..0f0056561 100644
index 3edeb4910..26b89799e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -71,7 +71,7 @@ index 3edeb4910..0f0056561 100644
@Override
+ public void sendActionBar(String message) {
+ if (getHandle().playerConnection == null || message == null || message.isEmpty()) return;
+ getHandle().playerConnection.sendPacket(new PacketPlayOutChat(net.minecraft.server.MCUtil.cmpFromMessage(message), (byte) 2));
+ getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), (byte) 2));
+ }
+
+ @Override