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

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:
3108e64a SPIGOT-4193: API for selecting entities by strings

CraftBukkit Changes:
ad6070df SPIGOT-4193: API for selecting entities by strings
This commit is contained in:
Shane Freeder 2019-01-31 04:49:52 +00:00
parent e87859d8a5
commit 7a73ce03e9
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
33 changed files with 247 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From b6914c6a90828e0fba1c673bc2dd43a32b7c28ca Mon Sep 17 00:00:00 2001
From ce7a08b7515e5720254f32939db266a4df6d908b 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
@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events
diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
new file mode 100644
index 00000000..529c5376
index 000000000..529c53760
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
@@ -0,0 +1,142 @@
@ -155,7 +155,7 @@ index 00000000..529c5376
+}
diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
new file mode 100644
index 00000000..d17061e6
index 000000000..d17061e66
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
@@ -0,0 +1,72 @@
@ -232,7 +232,7 @@ index 00000000..d17061e6
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 06d1725d..bc04472e 100644
index 41cd3dba2..f13d80cf2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -51,6 +51,9 @@ import org.bukkit.generator.ChunkGenerator;
@ -245,7 +245,7 @@ index 06d1725d..bc04472e 100644
/**
* Represents the Bukkit core, for version and Server singleton handling
*/
@@ -1449,6 +1452,37 @@ public final class Bukkit {
@@ -1475,6 +1478,37 @@ public final class Bukkit {
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@ -284,7 +284,7 @@ index 06d1725d..bc04472e 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 edadec3f..9f3ffb16 100644
index 46502ede1..198107081 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -52,6 +52,9 @@ import org.bukkit.generator.ChunkGenerator;
@ -297,7 +297,7 @@ index edadec3f..9f3ffb16 100644
/**
* Represents a server implementation.
*/
@@ -1253,5 +1256,30 @@ public interface Server extends PluginMessageRecipient {
@@ -1277,5 +1280,30 @@ public interface Server extends PluginMessageRecipient {
* @return true if player names should be suggested
*/
boolean suggestPlayerNamesWhenNullTabCompletions();