aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch')
-rw-r--r--Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch
index 57686181b7..9e9e9965c1 100644
--- a/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From fae815991d4346aba2ebd7615b6038aa39048961 Mon Sep 17 00:00:00 2001
+From 5a1131ad495b7b041e6438c4e8fd817e25b46be2 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Tue, 27 Dec 2016 15:02:42 -0500
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 1159eea1a..38359517c 100644
+index 1159eea1..38359517 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -1,10 +1,13 @@
@@ -62,13 +62,14 @@ index 1159eea1a..38359517c 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 61c32223d..072b59125 100644
+index 61c32223..072b5912 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -165,6 +165,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -164,6 +164,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ }
// Paper start
- @Override
++ @Override
+ public void sendActionBar(String message) {
+ if (getHandle().playerConnection == null || message == null || message.isEmpty()) return;
+ getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), (byte) 2));
@@ -80,10 +81,9 @@ index 61c32223d..072b59125 100644
+ sendActionBar(org.bukkit.ChatColor.translateAlternateColorCodes(alternateChar, message));
+ }
+
-+ @Override
+ @Override
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
- packet.header = header;
--
-2.12.2
+2.34.0