fix build for AC pr #21151 and minor code style adjustments#6

Nyeriah merged 1 commit intomasterazerothcore/mod-cta-switch:masterfrom

sudlud-patch-1azerothcore/mod-cta-switch:sudlud-patch-1Copy head branch name to clipboard