summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/bukkit/plugin/SimplePluginManager.java24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index addbca3e..3e89adf8 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -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");
}