Split MapEvent into functions for GUIs
Merge remote-tracking branch 'upstream/master'
Fixed die