Core/Creatures: make sure that UNIT_NPC_FLAG_TRAINER stays around for non-class trainers

1 files changed, 1 insertions, 1 deletions

diff --git a/src/server/game/Entities/Object/Updates/ViewerDependentValues.h b/src/server/game/Entities/Object/Updates/ViewerDependentValues.h
index 12cafb0132d..7e7ede08e76 100644
--- a/src/server/game/Entities/Object/Updates/ViewerDependentValues.h
+++ b/src/server/game/Entities/Object/Updates/ViewerDependentValues.h
@@ -365,7 +365,7 @@ public:
                 if (!receiver->CanSeeSpellClickOn(creature))
                     npcFlag &= ~UNIT_NPC_FLAG_SPELLCLICK;
 
-                if (!creature->IsClassTrainerFor(receiver))
+                if (creature->HasNpcFlag(UNIT_NPC_FLAG_TRAINER_CLASS) && !creature->IsClassTrainerFor(receiver))
                     npcFlag &= ~(UNIT_NPC_FLAG_TRAINER_CLASS | UNIT_NPC_FLAG_TRAINER);
             }
         }