mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update API patches to MC 1.12pre2

Browse source
This commit is contained in:
Zach Brown 2017-05-14 08:46:44 -05:00
parent e4f891c95a
commit 828d600143
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
21 changed files with 135 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
View file

@ -1,4 +1,4 @@
From 5075ebcd06026e2d2e713d47e86d4ad0ddbcbc2b Mon Sep 17 00:00:00 2001
From 17605bbb3704c5077bcf3a12aabe346de9684f78 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 f5af400d..1f663fa1 100644
index 43510bad..76d250f7 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1194,6 +1194,13 @@ public final class Bukkit {
@@ -1187,6 +1187,13 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@ -24,10 +24,10 @@ index f5af400d..1f663fa1 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 2df83245..4a90d581 100644
index 8922551f..b04b796a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1027,4 +1027,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1020,4 +1020,6 @@ public interface Server extends PluginMessageRecipient {
Spigot spigot();
void reloadPermissions(); // Paper
@ -52,7 +52,7 @@ index 30d60247..d8a75607 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 08976cd4..2e232fd1 100644
index 6e9fc84f..6f733fe0 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -280,4 +280,10 @@ public class SimpleCommandMap implements CommandMap {
@ -94,5 +94,5 @@ index 040509c1..0069bcc0 100644
confirmed = true;
} else {
--
2.12.2
2.11.0