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

Update Upstream

Browse Source
This commit is contained in:
Spottedleaf
2019-05-05 19:58:04 -07:00
parent cb24079b77
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From f333f65aab67ab8c458cf23bdf17639f475fce50 Mon Sep 17 00:00:00 2001
From fc25517cebc592f17213a25323f0954d9e540e5d 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 c97e116aa..e1af5c488 100644
index 3448b5588e..d7dc516e4a 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -42,10 +42,10 @@ index c97e116aa..e1af5c488 100644
public static boolean isMainThread() {
return MinecraftServer.getServer().isMainThread();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 4e12b6406..0b0053207 100644
index 06db4a8f04..37e9c86375 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -212,6 +212,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -214,6 +214,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start