butubb/azerothcore-wotlk
1
0
Fork 0
forked from mirror/azerothcore-wotlk
Code Pull Requests Activity

fix(Scripts/Wintergrasp): Use TeamId for vehicle teleporter (#25988)

Browse Source 
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Andrew
2026-05-26 21:42:43 -03:00
committed by GitHub
parent 1ff5147b85
commit d9d011727b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/zone_wintergrasp.cpp
+6 -3
View File
@@ -28,7 +28,6 @@
#include "ObjectMgr.h" #include "ObjectMgr.h"
#include "Player.h" #include "Player.h"
#include "PoolMgr.h" #include "PoolMgr.h"
#include "RaceMgr.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
#include "ScriptedGossip.h" #include "ScriptedGossip.h"
#include "SpellScript.h" #include "SpellScript.h"
@@ -860,8 +859,12 @@ public:
bool IsFriendly(Unit* passenger) bool IsFriendly(Unit* passenger)
{ {
return ((me->GetUInt32Value(GAMEOBJECT_FACTION) == WintergraspFaction[TEAM_HORDE] && passenger->getRaceMask() & sRaceMgr->GetHordeRaceMask()) || Player* player = passenger->ToPlayer();
(me->GetUInt32Value(GAMEOBJECT_FACTION) == WintergraspFaction[TEAM_ALLIANCE] && passenger->getRaceMask() & sRaceMgr->GetAllianceRaceMask())); if (!player)
return false;
TeamId goTeam = me->GetUInt32Value(GAMEOBJECT_FACTION) == WintergraspFaction[TEAM_HORDE] ? TEAM_HORDE : TEAM_ALLIANCE;
return player->GetTeamId() == goTeam;
} }
Creature* IsValidVehicle(Creature* cVeh) Creature* IsValidVehicle(Creature* cVeh)