twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update B/CB/S

Browse Source
This commit is contained in:
Zach Brown
2017-11-10 17:31:39 -05:00
parent 151ee47076
commit f141bae102
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-API-Patches/Add-command-to-reload-permissions.yml-and-require-co.patch
View File

@@ -35,7 +35,7 @@ index 18549ce0..032d6211 100644
+ void reloadPermissions(); // Paper + void reloadPermissions(); // Paper
} }
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
index c70d5129..040509c1 100644 index 0ab7e295..f331a442 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand { @@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand {
@@ -77,14 +77,14 @@ index c70d5129..040509c1 100644
Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server."); Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
Bukkit.reload(); Bukkit.reload();
@@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand { @@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand {
}
@Override @Override
public java.util.List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException - public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
{ - return Collections.emptyList();
- return java.util.Collections.emptyList(); + public java.util.List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
+ return java.util.Collections.singletonList("permissions"); // Paper + return java.util.Collections.singletonList("permissions"); // Paper
} }
// Spigot End
+
} }
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index b88f31ca..bd0588a2 100644 index b88f31ca..bd0588a2 100644

2
Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch
View File

@@ -70,7 +70,7 @@ index 762eb1d2..23d08336 100644
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
index 040509c1..0069bcc0 100644 index f331a442..a977045d 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand { @@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand {

11
Spigot-API-Patches/Make-plugins-list-alphabetical.patch
View File

@@ -5,13 +5,13 @@ Subject: [PATCH] Make /plugins list alphabetical
diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
index e21d1679..e2274fa2 100644 index e40b03a7..b1d384e8 100644
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@ package org.bukkit.command.defaults;
package org.bukkit.command.defaults;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Map; +import java.util.Map;
+import java.util.TreeMap; +import java.util.TreeMap;
@@ -48,6 +48,5 @@ index e21d1679..e2274fa2 100644
+ return "(" + plugins.size() + "): " + pluginList.toString(); + return "(" + plugins.size() + "): " + pluginList.toString();
+ // Paper end + // Paper end
} }
}
// Spigot Start
-- --

2
work/Bukkit

Submodule work/Bukkit updated: 100ab9f2dc...ebed1f62a8

2
work/CraftBukkit

Submodule work/CraftBukkit updated: 326c2e605f...61e0c69d5f

2
work/Spigot

Submodule work/Spigot updated: 95dd097033...d21162c022