Update to MC 1.12-pre2

This commit is contained in:
Zach Brown
2017-05-14 13:05:01 -05:00
parent 828d600143
commit 491286def4
151 changed files with 1315 additions and 1636 deletions

View File

@@ -1,4 +1,4 @@
From fae815991d4346aba2ebd7615b6038aa39048961 Mon Sep 17 00:00:00 2001
From c99f48d9799da82dbce8bf989e775e9159e09c64 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
@@ -62,16 +62,16 @@ 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 d1f70af51..d698d7c0d 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 {
@@ -173,6 +173,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Paper start
@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));
+ getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO));
+ }
+
+ @Override
@@ -85,5 +85,5 @@ index 61c32223d..072b59125 100644
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
packet.header = header;
--
2.12.2
2.13.0