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

Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
6ffe5a68 Add RecipeChoice.ExactChoice API for NBT matches on ingredients
ffccf6b7 SPIGOT-4560: Add HumanEntity.sleep and related APIs

CraftBukkit Changes:
917411fd Remove redundant BlockPosition creation from sleep API
756c38d1 Add RecipeChoice.ExactChoice API for NBT matches on ingredients
8e65d8df SPIGOT-4560: Add HumanEntity.sleep and related APIs
a8382862 SPIGOT-4562: reducedDebugInfo not updated on world change
This commit is contained in:
Shane Freeder
2019-01-02 18:10:14 +00:00
parent 5d5e0ad75c
commit ccbeb5c4ed
38 changed files with 225 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 0d984d092d2501eb061c821b72120350a3e77d7c Mon Sep 17 00:00:00 2001
From aa230590808b0776260e52ea7018c88bb1462324 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 c97e116aaf..e1af5c4885 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 1f21e54ab..05070285b 100644
index ecef2a6ad6..35eb4279ec 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -209,6 +209,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -207,6 +207,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start
@@ -65,5 +65,5 @@ index 1f21e54ab..05070285b 100644
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
if (header != null) {
--
2.20.0
2.20.1