SPIGOT-2134: Use the correct listener in CommandExecute

By: Thinkofname <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot 2016-05-01 20:38:40 +01:00
parent 6ada881202
commit da48f2cbd4

View file

@ -41,7 +41,7 @@
+ } else if (listener instanceof CommandBlockListenerAbstract) { + } else if (listener instanceof CommandBlockListenerAbstract) {
+ sender = ((CommandBlockListenerAbstract) listener).sender; + sender = ((CommandBlockListenerAbstract) listener).sender;
+ } else if (listener instanceof ProxyListener) { + } else if (listener instanceof ProxyListener) {
+ listener = ((ProxyListener) icommandlistener).base; // Search deeper + listener = ((ProxyListener) listener).base; // Search deeper
+ } else if (VanillaCommandWrapper.lastSender != null) { + } else if (VanillaCommandWrapper.lastSender != null) {
+ sender = VanillaCommandWrapper.lastSender; + sender = VanillaCommandWrapper.lastSender;
+ } else if (listener.f() != null) { + } else if (listener.f() != null) {