Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

[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
29 changed files with 212 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-API-Patches/0013-Expose-server-CommandMap.patch
View File

@@ -1,11 +1,11 @@
From 94aaaeb3d173b4f5a3f4e9d8943dd46b12a3a9ea Mon Sep 17 00:00:00 2001
From ed3bce499ebcdfea83b210abbbb180c39700a3a9 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index bfe388fc0..dbfd6e41d 100644
index c7bb73e6..97dc7b22 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
@@ -20,7 +20,7 @@ index bfe388fc0..dbfd6e41d 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -1274,6 +1271,17 @@ public final class Bukkit {
@@ -1315,6 +1312,17 @@ public final class Bukkit {
return server.getUnsafe();
}
@@ -39,7 +39,7 @@ index bfe388fc0..dbfd6e41d 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9b71cbffc..c23ae761e 100644
index ddfd2219..4d00b141 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
@@ -54,7 +54,7 @@ index 9b71cbffc..c23ae761e 100644
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
@@ -957,6 +954,14 @@ public interface Server extends PluginMessageRecipient {
@@ -994,6 +991,14 @@ public interface Server extends PluginMessageRecipient {
public double[] getTPS();
// Paper end
@@ -70,5 +70,5 @@ index 9b71cbffc..c23ae761e 100644
* Get the advancement specified by this key.
*
--
2.18.0
2.19.0