aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Spells
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/scripts/Spells')
-rw-r--r--src/server/scripts/Spells/spell_generic.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 5b0f9ac28f9..72648887d77 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -1093,7 +1093,7 @@ class spell_gen_create_lance : public SpellScript
{
if (target->GetTeam() == ALLIANCE)
GetCaster()->CastSpell(target, SPELL_CREATE_LANCE_ALLIANCE, true);
- else
+ else if (target->GetTeam() == HORDE)
GetCaster()->CastSpell(target, SPELL_CREATE_LANCE_HORDE, true);
}
}
@@ -4704,7 +4704,7 @@ class spell_defender_of_azeroth_death_gate_selector : public SpellScript
if (player->GetQuestStatus(QUEST_DEFENDER_OF_AZEROTH_ALLIANCE) == QUEST_STATUS_NONE && player->GetQuestStatus(QUEST_DEFENDER_OF_AZEROTH_HORDE) == QUEST_STATUS_NONE)
return;
- BindLocation bindLoc = player->GetTeam() == ALLIANCE ? StormwindInnLoc : OrgrimmarInnLoc;
+ BindLocation const& bindLoc = player->GetTeam() == ALLIANCE ? StormwindInnLoc : OrgrimmarInnLoc;
player->SetHomebind(bindLoc.Loc, bindLoc.AreaId);
player->SendBindPointUpdate();
player->SendPlayerBound(player->GetGUID(), bindLoc.AreaId);
@@ -5018,7 +5018,7 @@ class spell_gen_skinning : public SpellScript
case SKILL_CATACLYSM_SKINNING: return SPELL_CATACLYSM_SKINNING;
case SKILL_PANDARIA_SKINNING: return SPELL_PANDARIA_SKINNING;
case SKILL_DRAENOR_SKINNING: return SPELL_DRAENOR_SKINNING;
- case SKILL_KUL_TIRAN_SKINNING: return player->GetTeam() == ALLIANCE ? SPELL_KUL_TIRAN_SKINNING : SPELL_ZANDALARI_SKINNING;
+ case SKILL_KUL_TIRAN_SKINNING: return player->GetTeam() == ALLIANCE ? SPELL_KUL_TIRAN_SKINNING : (player->GetTeam() == HORDE ? SPELL_ZANDALARI_SKINNING : 0);
case SKILL_SHADOWLANDS_SKINNING: return SPELL_SHADOWLANDS_SKINNING;
case SKILL_DRAGON_ISLES_SKINNING: return SPELL_DRAGON_ISLES_SKINNING;
case SKILL_CLASSIC_SKINNING: // Trainer only