MC 1.14.1

This commit is contained in:
Zach Brown 2019-05-13 21:20:58 -05:00
parent 5e7cfaf718
commit d84080e6d1
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
278 changed files with 1269 additions and 1298 deletions

View file

@ -1,4 +1,4 @@
From 5ecb0a4ced346f99f3fe3b209ec4b6bf6bd7b2c8 Mon Sep 17 00:00:00 2001
From 8e06e63bd85cca024c4e38e35741ddac6f809b48 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 d1845cf3..bef53644 100644
index a3682b29..a0a8b540 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1525,6 +1525,15 @@ public final class Bukkit {
@@ -1523,6 +1523,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@ -26,10 +26,10 @@ index d1845cf3..bef53644 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 41731a28..54da4d99 100644
index 18faba0e..d20e044d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1342,4 +1342,6 @@ public interface Server extends PluginMessageRecipient {
@@ -1340,4 +1340,6 @@ public interface Server extends PluginMessageRecipient {
// Spigot end
void reloadPermissions(); // Paper