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

[Auto] 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:
b9620fd9 API to generate filled explorer maps

CraftBukkit Changes:
c1ecaa2f API to generate filled explorer maps
This commit is contained in:
Aikar 2018-09-24 05:41:32 -04:00
parent 1a78799cc0
commit 917d582441
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
29 changed files with 212 additions and 212 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 d97433ee8959c0eb3fc72716910954cd5abb85bd Mon Sep 17 00:00:00 2001
From 45870392712448cb1e7f594cb52128792cf41fb1 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 000000000..529c53760
index 00000000..529c5376
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
@@ -0,0 +1,142 @@
@ -155,7 +155,7 @@ index 000000000..529c53760
+}
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 000000000..d17061e66
index 00000000..d17061e6
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
@@ -0,0 +1,72 @@
@ -232,7 +232,7 @@ index 000000000..d17061e66
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index a8234e626..39e52986c 100644
index 756d9c34..b80a22b0 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;
@ -245,7 +245,7 @@ index a8234e626..39e52986c 100644
/**
* Represents the Bukkit core, for version and Server singleton handling
*/
@@ -1326,6 +1329,37 @@ public final class Bukkit {
@@ -1367,6 +1370,37 @@ public final class Bukkit {
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@ -284,7 +284,7 @@ index a8234e626..39e52986c 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 f164137e4..64c78caf3 100644
index 4b342052..5ac21b51 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;
@ -297,7 +297,7 @@ index f164137e4..64c78caf3 100644
/**
* Represents a server implementation.
*/
@@ -1142,5 +1145,30 @@ public interface Server extends PluginMessageRecipient {
@@ -1179,5 +1182,30 @@ public interface Server extends PluginMessageRecipient {
* @return true if player names should be suggested
*/
boolean suggestPlayerNamesWhenNullTabCompletions();
@ -329,5 +329,5 @@ index f164137e4..64c78caf3 100644
// Paper end
}
--
2.18.0
2.19.0