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

16
Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
View file

@ -1,4 +1,4 @@
From 45870392712448cb1e7f594cb52128792cf41fb1 Mon Sep 17 00:00:00 2001
From 5f476c71f78bbd03f6d90d9bde7ae9254569f79d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 15 Jan 2018 21:46:46 -0500
Subject: [PATCH] Basic PlayerProfile API
@ -232,10 +232,10 @@ index 00000000..d17061e6
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 756d9c34..b80a22b0 100644
index cb21a4e4..02e7d118 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -47,6 +47,9 @@ import org.bukkit.generator.ChunkGenerator;
@@ -51,6 +51,9 @@ import org.bukkit.generator.ChunkGenerator;
import org.bukkit.inventory.ItemFactory;
import org.bukkit.inventory.meta.ItemMeta;
@ -245,7 +245,7 @@ index 756d9c34..b80a22b0 100644
/**
* Represents the Bukkit core, for version and Server singleton handling
*/
@@ -1367,6 +1370,37 @@ public final class Bukkit {
@@ -1445,6 +1448,37 @@ public final class Bukkit {
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@ -284,10 +284,10 @@ index 756d9c34..b80a22b0 100644
public static Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 4b342052..5ac21b51 100644
index 10f56d4f..9e7bc162 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -48,6 +48,9 @@ import org.bukkit.generator.ChunkGenerator;
@@ -52,6 +52,9 @@ import org.bukkit.generator.ChunkGenerator;
import org.bukkit.inventory.ItemFactory;
import org.bukkit.inventory.meta.ItemMeta;
@ -297,7 +297,7 @@ index 4b342052..5ac21b51 100644
/**
* Represents a server implementation.
*/
@@ -1179,5 +1182,30 @@ public interface Server extends PluginMessageRecipient {
@@ -1249,5 +1252,30 @@ public interface Server extends PluginMessageRecipient {
* @return true if player names should be suggested
*/
boolean suggestPlayerNamesWhenNullTabCompletions();
@ -329,5 +329,5 @@ index 4b342052..5ac21b51 100644
// Paper end
}
--
2.19.0
2.19.1