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: 18cda936 Fix variant of unloadChunkRequest that was incorrectly never deprecated 00763e1b Deprecate some methods 35a83d54 SPIGOT-4572: Make default no permission message clearer 6163343d Fix some misplaced material enum entries 8736469c Fix typo in TechnicalPiston documentation CraftBukkit Changes: 0c715b32 SPIGOT-4579: Shulker boxes not dropping in creative 50fbc3f1 SPIGOT-4576: Fix attributes in itemstack internal data being lost 8059a937 SPIGOT-4577: Fix loss of int/double custom tags when serialized to yaml 07e504c3 Clarify exception thrown when setting drop chance for player inventory 98b862ad Fix duplicate iron golem add 843cee65 Fix a bunch of duplicate EntityCombustEvent calls 43855624 SPIGOT-4571: EntityCombustEvent not firing for phantoms
This commit is contained in:
parent
21ba01aaf4
commit
54dd19b818
56 changed files with 404 additions and 402 deletions
|
@ -1,4 +1,4 @@
|
|||
From f643969a027f9886c578f9702b3d919bf573e93c Mon Sep 17 00:00:00 2001
|
||||
From 9fa647183cd2baf1c91e1138b8da71cab372831a 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 39ff2f9e..b4a7835a 100644
|
||||
index 60e7ceb6..66ebbaf7 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1426,6 +1426,15 @@ public final class Bukkit {
|
||||
@@ -1430,6 +1430,15 @@ public final class Bukkit {
|
||||
public static void reloadPermissions() {
|
||||
server.reloadPermissions();
|
||||
}
|
||||
|
@ -26,10 +26,10 @@ index 39ff2f9e..b4a7835a 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 80ef1270..1a0a30ee 100644
|
||||
index 2c07e6a2..2fbee277 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1238,4 +1238,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1242,4 +1242,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
// Spigot end
|
||||
|
||||
void reloadPermissions(); // Paper
|
||||
|
@ -97,5 +97,5 @@ index f331a442..a977045d 100644
|
|||
confirmed = true;
|
||||
} else {
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue