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

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown
2017-02-17 20:03:38 -06:00
parent f654bf8fc2
commit ae98591b8c
25 changed files with 165 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 199a8c759491c9d4891263cecd97c65c097002c0 Mon Sep 17 00:00:00 2001
From 346c2e08ae20b6e9c24f10ccb78f6c8a4a095c94 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 1159eea1a..38359517c 100644
index 1159eea..3835951 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -1,10 +1,13 @@
@@ -62,10 +62,10 @@ 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 3edeb4910..26b89799e 100644
index 84b2e54..62e70a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -163,6 +163,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -165,6 +165,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Paper start
@Override
@@ -85,5 +85,5 @@ index 3edeb4910..26b89799e 100644
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
packet.header = header;
--
2.11.0
2.9.3