Chronika/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nullcheck in registerEvent (thanks to an old PR by LRFLEW - I'm sorry for the wait!)

Browse Source
This commit is contained in:
Nathan Adams
2012-01-14 14:31:00 +00:00
parent 239ece5c19
commit 987d277d91
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/bukkit/plugin/SimplePluginManager.java
View File

@@ -373,6 +373,18 @@ public final class SimplePluginManager implements PluginManager {
* @param plugin Plugin to register
*/
public void registerEvent(Event.Type type, Listener listener, Priority priority, Plugin plugin) {
if (type == null) {
throw new IllegalArgumentException("Type cannot be null");
}
if (listener == null) {
throw new IllegalArgumentException("Listener cannot be null");
}
if (priority == null) {
throw new IllegalArgumentException("Priority cannot be null");
}
if (plugin == null) {
throw new IllegalArgumentException("Priority cannot be null");
}
if (!plugin.isEnabled()) {
throw new IllegalPluginAccessException("Plugin attempted to register " + type + " while not enabled");
}
@@ -390,6 +402,18 @@ public final class SimplePluginManager implements PluginManager {
* @param plugin Plugin to register
*/
public void registerEvent(Event.Type type, Listener listener, EventExecutor executor, Priority priority, Plugin plugin) {
if (type == null) {
throw new IllegalArgumentException("Type cannot be null");
}
if (listener == null) {
throw new IllegalArgumentException("Listener cannot be null");
}
if (priority == null) {
throw new IllegalArgumentException("Priority cannot be null");
}
if (plugin == null) {
throw new IllegalArgumentException("Priority cannot be null");
}
if (!plugin.isEnabled()) {
throw new IllegalPluginAccessException("Plugin attempted to register " + type + " while not enabled");
}