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:
parent
825191f069
commit
13d1abf01e
28 changed files with 394 additions and 348 deletions
|
@ -1,4 +1,4 @@
|
|||
From 91f8d92c9957a90a8f35f0459b3775b7e592b4ba Mon Sep 17 00:00:00 2001
|
||||
From 305f8749b7972506665be9ad41cdaa5fb020e60f Mon Sep 17 00:00:00 2001
|
||||
From: willies952002 <admin@domnian.com>
|
||||
Date: Mon, 28 Nov 2016 10:16:39 -0500
|
||||
Subject: [PATCH] Allow Reloading of Command Aliases
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
|
|||
Reload the aliases stored in commands.yml
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index e1704ae2a..a312a662b 100644
|
||||
index 2d588c6b..5715057a 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1456,6 +1456,15 @@ public final class Bukkit {
|
||||
@@ -1473,6 +1473,15 @@ public final class Bukkit {
|
||||
public static void reloadPermissions() {
|
||||
server.reloadPermissions();
|
||||
}
|
||||
|
@ -26,10 +26,10 @@ index e1704ae2a..a312a662b 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 89f68d58e..a03591829 100644
|
||||
index 18e5dd48..259a0fbe 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1266,4 +1266,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1281,4 +1281,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
// Spigot end
|
||||
|
||||
void reloadPermissions(); // Paper
|
||||
|
@ -37,7 +37,7 @@ index 89f68d58e..a03591829 100644
|
|||
+ boolean reloadCommandAliases(); // Paper
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
|
||||
index 30d60247e..938959aa5 100644
|
||||
index 30d60247..938959aa 100644
|
||||
--- a/src/main/java/org/bukkit/command/CommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/CommandMap.java
|
||||
@@ -123,4 +123,13 @@ public interface CommandMap {
|
||||
|
@ -55,7 +55,7 @@ index 30d60247e..938959aa5 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index 65ad78c48..41e95692e 100644
|
||||
index 65ad78c4..41e95692 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -279,4 +279,10 @@ public class SimpleCommandMap implements CommandMap {
|
||||
|
@ -70,7 +70,7 @@ index 65ad78c48..41e95692e 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
index f331a4423..a977045de 100644
|
||||
index f331a442..a977045d 100644
|
||||
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue