[Auto] Updated Upstream (Bukkit/CraftBukkit)

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
29 changed files with 212 additions and 212 deletions

View File

@@ -1,14 +1,14 @@
From 980c18d11ba35a9d4c2afaa594788f26ae219b7d Mon Sep 17 00:00:00 2001
From 76511263884d3cda914b6672710ece89277ab42b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:24:57 -0600
Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5046816b8..bfe388fc0 100644
index 242c6fba..c7bb73e6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1154,6 +1154,16 @@ public final class Bukkit {
@@ -1195,6 +1195,16 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@@ -26,10 +26,10 @@ index 5046816b8..bfe388fc0 100644
* Get the advancement specified by this key.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ae8120e2e..9b71cbffc 100644
index 33934411..ddfd2219 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -948,6 +948,15 @@ public interface Server extends PluginMessageRecipient {
@@ -985,6 +985,15 @@ public interface Server extends PluginMessageRecipient {
*/
Entity getEntity(UUID uuid);
@@ -46,5 +46,5 @@ index ae8120e2e..9b71cbffc 100644
* Get the advancement specified by this key.
*
--
2.18.0
2.19.0