Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has only been PARTIALLY tested by PaperMC and as with ANY update, please do your own testing I've tested basic region file saving as well as our oversized chunks approach. Bukkit Changes: e167e549 Clarify MerchantInventory#getSelectedRecipe. 3a1d5b8f Apply default permissions by registration order. c64cc93f Make tags Keyed ec037ed7 Added a method to get a list of tags bfb6ef86 Introduce rotation methods to the Vector class fc727372 Remove draft API from FluidLevelChangeEvent CraftBukkit Changes: 6430d9c0 SPIGOT-4632: BlockState location is not fixed 14cd1688 Fix CraftInventoryMerchant#getSelectedRecipe if there is no active merchant recipe. c24abab7 Load custom permissions after default permissions. bc99dfe8 Make tags Keyed 6fce004f Added a method to get a list of tags Spigot Changes: e5e5c7c6 Allow Saving Large Chunks e8d3881c Rebuild patches
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
From 06f6137e4b84d9d2a2e29b74cc652e0d66845d3a Mon Sep 17 00:00:00 2001
|
||||
From 1aea2e6ad04b50f18e972f4b30a3f2855b6108eb 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 e1ce29328..e4d945830 100644
|
||||
index 6055c801..cb7dc068 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1420,6 +1420,17 @@ public final class Bukkit {
|
||||
@@ -1437,6 +1437,17 @@ public final class Bukkit {
|
||||
return server.getUnsafe();
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ index e1ce29328..e4d945830 100644
|
||||
{
|
||||
return server.spigot();
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index fea2ad6f4..29e3feb1e 100644
|
||||
index 1632af18..c4dc1de2 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1065,6 +1065,14 @@ public interface Server extends PluginMessageRecipient {
|
||||
|
||||
Reference in New Issue
Block a user