Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild Patches

Browse Source
This commit is contained in:
BillyGalbreath
2018-07-28 22:15:52 -05:00
parent b3b0b9f24a
commit 3e19de0cf5
28 changed files with 165 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From f5962e81f2d63910e83d54400b0173879b453d57 Mon Sep 17 00:00:00 2001
From 11b6ff1e304a5bdfdeff1f418dbf0b31325788c0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 70cdc3f102..381542e0d2 100644
index 70cdc3f10..381542e0d 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -1,10 +1,13 @@
@@ -62,14 +62,13 @@ index 70cdc3f102..381542e0d2 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index dea59d3fab..a546f3118e 100644
index dea59d3fa..a546f3118 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -208,6 +208,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
@@ -209,6 +209,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 net.minecraft.server.ChatComponentText(message), net.minecraft.server.ChatMessageType.GAME_INFO));
@@ -81,9 +80,10 @@ index dea59d3fab..a546f3118e 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.18.0
2.11.0