Refactored Player and Entity Effect logic