mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source 
--- work/Bukkit
Submodule work/Bukkit 1627782b..67e91ef7:
  > Fix some incorrectly handled JavaDoc
  > SPIGOT-4478: Update PlayerLoginEvent docs
  > Add API to manipulate boss bar of entities and those created by commands

--- work/CraftBukkit
Submodule work/CraftBukkit ca22de36..3a911828:
  > SPIGOT-4477: Arrows only firing direction of boat
  > SPIGOT-4478: NPE during PlayerLoginEvent recipe manipulation
  > Add API to manipulate boss bar of entities and those created by commands

--- work/Spigot
Submodule work/Spigot 2474d93d..947a8e7f:
  > Rebuild patches
This commit is contained in:
Zach Brown 2018-11-11 00:37:15 -05:00
parent 8b8e15fb63
commit dcebe229b5
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
45 changed files with 359 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Spigot-API-Patches/0088-getPlayerUniqueId-API.patch
View file

@ -1,4 +1,4 @@
From 7a5cdf865d3a693927a9f2c01082038f67eea707 Mon Sep 17 00:00:00 2001
From 8ddad2ac0889f686038b73a4b10aaf8a3a6333fc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 22 Mar 2018 01:39:28 -0400
Subject: [PATCH] getPlayerUniqueId API
@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 39e52986c..491c73832 100644
index 02e7d118..233a7154 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -427,6 +427,20 @@ public final class Bukkit {
@@ -431,6 +431,20 @@ public final class Bukkit {
return server.getPlayer(id);
}
@ -34,10 +34,10 @@ index 39e52986c..491c73832 100644
* Gets the plugin manager for interfacing with plugins.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 64c78caf3..f75fe8b15 100644
index 9e7bc162..b8076fc3 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -357,6 +357,18 @@ public interface Server extends PluginMessageRecipient {
@@ -361,6 +361,18 @@ public interface Server extends PluginMessageRecipient {
*/
public Player getPlayer(UUID id);
@ -57,5 +57,5 @@ index 64c78caf3..f75fe8b15 100644
* Gets the plugin manager for interfacing with plugins.
*
--
2.18.0
2.19.1