Cleaned up Damage Listener code
Merge branch 'master' of https://github.com/ScottWoodward/RPShops