Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Players: Slightly improve neutral player faction support

Browse Source
This commit is contained in:
Shauren
2024-03-24 14:39:29 +01:00
parent aac5581bfc
commit 94b78ebc8b
26 changed files with 178 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
View File

@@ -66,16 +66,12 @@ class instance_shattered_halls : public InstanceMapScript
LoadDungeonEncounterData(encounters);
executionTimer = 0;
executed = 0;
_team = 0;
}
void OnPlayerEnter(Player* player) override
{
Aura* ex = nullptr;
if (!_team)
_team = player->GetTeam();
player->CastSpell(player, SPELL_REMOVE_KARGATH_EXECUTIONER, true);
if (!executionTimer || executionerGUID.IsEmpty())
@@ -102,14 +98,6 @@ class instance_shattered_halls : public InstanceMapScript
void OnCreatureCreate(Creature* creature) override
{
if (!_team)
{
Map::PlayerList const& players = instance->GetPlayers();
if (!players.isEmpty())
if (Player* player = players.begin()->GetSource())
_team = player->GetTeam();
}
switch (creature->GetEntry())
{
case NPC_GRAND_WARLOCK_NETHEKURSE:
@@ -119,7 +107,7 @@ class instance_shattered_halls : public InstanceMapScript
kargathGUID = creature->GetGUID();
break;
case NPC_RANDY_WHIZZLESPROCKET:
if (_team == HORDE)
if (instance->GetTeamInInstance() == HORDE)
creature->UpdateEntry(NPC_DRISELLA);
break;
case NPC_SHATTERED_EXECUTIONER:
@@ -205,7 +193,7 @@ class instance_shattered_halls : public InstanceMapScript
case DATA_PRISONERS_EXECUTED:
return executed;
case DATA_TEAM_IN_INSTANCE:
return _team;
return instance->GetTeamInInstance();
default:
return 0;
}
@@ -249,7 +237,6 @@ class instance_shattered_halls : public InstanceMapScript
uint8 executed;
uint32 executionTimer;
uint32 _team;
};
};