Should fix NPE
Using command sender for PInfoExtraFieldsEvent
Using correct input for PInfoExtraFieldsEvent