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

[Bleeding] Also blacklist ":" in plugin command aliases.

Browse Source 
By: t00thpick1 <t00thpick1dirko@gmail.com>
This commit is contained in:
Bukkit/Spigot
2014-02-08 15:50:30 -05:00
parent 2ee5a01e78
commit 2c68d4b554
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-api/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
View File

@@ -44,11 +44,19 @@ public class PluginCommandYamlParser {
if (aliases instanceof List) { if (aliases instanceof List) {
for (Object o : (List<?>) aliases) { for (Object o : (List<?>) aliases) {
if (o.toString().contains(":")) {
Bukkit.getServer().getLogger().severe("Could not load alias " + o.toString() + " for plugin " + plugin.getName() + ": Illegal Characters");
continue;
}
aliasList.add(o.toString()); aliasList.add(o.toString());
} }
} else {
if (aliases.toString().contains(":")) {
Bukkit.getServer().getLogger().severe("Could not load alias " + aliases.toString() + " for plugin " + plugin.getName() + ": Illegal Characters");
} else { } else {
aliasList.add(aliases.toString()); aliasList.add(aliases.toString());
} }
}
newCmd.setAliases(aliasList); newCmd.setAliases(aliasList);
} }

6
paper-api/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
View File

@@ -537,7 +537,9 @@ public final class PluginDescriptionFile {
* <td>Alternative command names, with special usefulness for commands * <td>Alternative command names, with special usefulness for commands
* that are already registered. <i>Aliases are not effective when * that are already registered. <i>Aliases are not effective when
* defined at runtime,</i> so the plugin description file is the * defined at runtime,</i> so the plugin description file is the
* only way to have them properly defined.</td> * only way to have them properly defined.
* <p>
* Note: Command aliases may not have a colon in them.</td>
* <td>Single alias format: * <td>Single alias format:
* <blockquote><pre>aliases: combust_me</pre></blockquote> or * <blockquote><pre>aliases: combust_me</pre></blockquote> or
* multiple alias format: * multiple alias format:
@@ -617,7 +619,7 @@ public final class PluginDescriptionFile {
* # Having an empty declaration is useful for defining the description, permission, and messages from a configuration dynamically * # Having an empty declaration is useful for defining the description, permission, and messages from a configuration dynamically
* apocalypse: * apocalypse:
*</pre></blockquote> *</pre></blockquote>
* Note: command names may not have a colon in their name. * Note: Command names may not have a colon in their name.
* *
* @return the commands this plugin will register * @return the commands this plugin will register
*/ */