Extracted common functionality between EntityEventHandler and PlayerEventHandler to a parent class
Fixed a small amount of things to prepare for deployment for testing