This should fix it. Also changed CommandListener to ChatListener.
Hopefully.
Merge remote-tracking branch 'origin/master'