summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-09 00:19:55 -0600
committerfeildmaster <admin@feildmaster.com>2012-12-09 00:31:25 -0600
commit40117b8952678ec6a96f8a54440c791ea73beaa6 (patch)
tree4c1a951fa4ec93ad0c8e41d07c658d441216ac39 /src/main/java/org
parent7631c22aeaadb9ae6a216f81e32a9c4b4bab04eb (diff)
downloadbukkit-40117b8952678ec6a96f8a54440c791ea73beaa6.tar
bukkit-40117b8952678ec6a96f8a54440c791ea73beaa6.tar.gz
bukkit-40117b8952678ec6a96f8a54440c791ea73beaa6.tar.lz
bukkit-40117b8952678ec6a96f8a54440c791ea73beaa6.tar.xz
bukkit-40117b8952678ec6a96f8a54440c791ea73beaa6.zip
An executor set to null will now use the plugin. Fixes BUKKIT-3127
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/command/PluginCommand.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
index d34140c3..ec66c28a 100644
--- a/src/main/java/org/bukkit/command/PluginCommand.java
+++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -61,7 +61,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
* @param executor New executor to run
*/
public void setExecutor(CommandExecutor executor) {
- this.executor = executor;
+ this.executor = executor == null ? owningPlugin : executor;
}
/**