fix?
isplayer
Merge pull request #1014 from CalebJohn/killing-floor

Fixes #1007