removed PLAYER_UUID-workaround => added entity-groups