Core/Battlegrounds: Replaced overriding m_team with more fine grained approach

2 files changed, 4 insertions, 2 deletions

diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 4118b0d7608..dcf8476e432 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -2729,7 +2729,7 @@ class spell_gen_pvp_trinket : public SpellScript
     {
         Player* caster = GetCaster()->ToPlayer();
 
-        switch (caster->GetTeam())
+        switch (caster->GetEffectiveTeam())
         {
             case ALLIANCE:
                 caster->CastSpell(caster, SPELL_PVP_TRINKET_ALLIANCE, TRIGGERED_FULL_MASK);
@@ -2737,6 +2737,8 @@ class spell_gen_pvp_trinket : public SpellScript
             case HORDE:
                 caster->CastSpell(caster, SPELL_PVP_TRINKET_HORDE, TRIGGERED_FULL_MASK);
                 break;
+            default:
+                break;
         }
     }
 
diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp
index 46e221e5753..c17e3826413 100644
--- a/src/server/scripts/World/achievement_scripts.cpp
+++ b/src/server/scripts/World/achievement_scripts.cpp
@@ -45,7 +45,7 @@ class achievement_bg_control_all_nodes : public AchievementCriteriaScript
         bool OnCheck(Player* source, Unit* /*target*/) override
         {
             if (Battleground* bg = source->GetBattleground())
-                return bg->IsAllNodesControlledByTeam(source->GetTeam());
+                return bg->IsAllNodesControlledByTeam(bg->GetPlayerTeam(source->GetGUID()));
 
             return false;
         }