Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Reduce differences between branches

Browse Source
This commit is contained in:
Shauren
2025-10-04 15:05:17 +02:00
parent c0c342715b
commit 3d8a75b0b5
7 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View File

@@ -648,7 +648,7 @@ struct npc_spinestalker : public ScriptedAI
// Increase add count
if (!me->isDead())
{
_instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade
_instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade
Reset();
}
}
@@ -670,7 +670,7 @@ struct npc_spinestalker : public ScriptedAI
void JustAppeared() override
{
ScriptedAI::JustAppeared();
_instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade
_instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade
}
void JustDied(Unit* /*killer*/) override
@@ -773,7 +773,7 @@ struct npc_rimefang_icc : public ScriptedAI
// Increase add count
if (!me->isDead())
{
_instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade
_instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade
Reset();
}
}
@@ -795,7 +795,7 @@ struct npc_rimefang_icc : public ScriptedAI
void JustAppeared() override
{
ScriptedAI::JustAppeared();
_instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade
_instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade
}
void JustDied(Unit* /*killer*/) override
@@ -929,7 +929,7 @@ struct npc_sindragosa_trash : public ScriptedAI
if (!me->isDead())
{
if (me->GetEntry() == NPC_FROSTWING_WHELP)
_instance->SetGuidData(_frostwyrmId, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade
_instance->SetData64(_frostwyrmId, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade
Reset();
}
}
@@ -952,7 +952,7 @@ struct npc_sindragosa_trash : public ScriptedAI
// Increase add count
if (me->GetEntry() == NPC_FROSTWING_WHELP)
_instance->SetGuidData(_frostwyrmId, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId())); // this cannot be in Reset because reset also happens on evade
_instance->SetData64(_frostwyrmId, me->GetSpawnId()); // this cannot be in Reset because reset also happens on evade
}
void SetData(uint32 type, uint32 data) override

10
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View File

@@ -1015,18 +1015,20 @@ class instance_icecrown_citadel : public InstanceMapScript
}
}
void SetGuidData(uint32 type, ObjectGuid guid) override
void SetData64(uint32 type, uint64 data) override
{
switch (type)
{
case DATA_SINDRAGOSA_FROSTWYRMS:
FrostwyrmGUIDs.insert(guid.GetCounter());
FrostwyrmGUIDs.insert(data);
break;
case DATA_SPINESTALKER:
SpinestalkerTrash.insert(guid.GetCounter());
SpinestalkerTrash.insert(data);
break;
case DATA_RIMEFANG:
RimefangTrash.insert(guid.GetCounter());
RimefangTrash.insert(data);
break;
default:
break;
}
}