Port spawnmob changes to 3.x
Merge pull request #410 from GunfighterJ/master

Port spawnmob changes to 3.x