Initial work on 1.14 pre-5
This commit is contained in:
parent
fb25dc17c6
commit
6c3f04049d
315 changed files with 1547 additions and 1648 deletions
|
@ -1,4 +1,4 @@
|
|||
From c1756d0416f0a65ab568975369fccfbbf04118d1 Mon Sep 17 00:00:00 2001
|
||||
From 115bd301484371f6d9f6dfdec617abbe9df39f74 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 03ba0b38..08570c13 100644
|
||||
index 9fe31fab..c7f4c6f2 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1553,6 +1553,15 @@ public final class Bukkit {
|
||||
@@ -1536,6 +1536,15 @@ public final class Bukkit {
|
||||
public static void reloadPermissions() {
|
||||
server.reloadPermissions();
|
||||
}
|
||||
|
@ -26,10 +26,10 @@ index 03ba0b38..08570c13 100644
|
|||
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 2a47c12d..fc8887d1 100644
|
||||
index f6d9720c..f248400e 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1366,4 +1366,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1351,4 +1351,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
// Spigot end
|
||||
|
||||
void reloadPermissions(); // Paper
|
||||
|
@ -56,10 +56,10 @@ index bd2c7a69..864c263b 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index 682d27f9..b78f3d69 100644
|
||||
index 911d90fd..8d352eeb 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -285,4 +285,11 @@ public class SimpleCommandMap implements CommandMap {
|
||||
@@ -289,4 +289,11 @@ public class SimpleCommandMap implements CommandMap {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -72,10 +72,10 @@ index 682d27f9..b78f3d69 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 ba118dbf..607323a8 100644
|
||||
index c62da413..af8ab73f 100644
|
||||
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
@@ -14,7 +14,7 @@ public class ReloadCommand extends BukkitCommand {
|
||||
@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
|
||||
public ReloadCommand(@NotNull String name) {
|
||||
super(name);
|
||||
this.description = "Reloads the server configuration and plugins";
|
||||
|
@ -84,7 +84,7 @@ index ba118dbf..607323a8 100644
|
|||
this.setPermission("bukkit.command.reload");
|
||||
this.setAliases(Arrays.asList("rl"));
|
||||
}
|
||||
@@ -30,6 +30,13 @@ public class ReloadCommand extends BukkitCommand {
|
||||
@@ -29,6 +29,13 @@ public class ReloadCommand extends BukkitCommand {
|
||||
Bukkit.getServer().reloadPermissions();
|
||||
Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded.");
|
||||
return true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue