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

Core/Spells: fixed some tabbing of old code remains from old battle resurrection implementation and use the resurrecting player as map reference target instead of the player

Browse Source
This commit is contained in:
Ovahlord
2018-08-19 13:44:33 +02:00
parent 9ad9d7c518
commit cca989638d
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/game/Handlers/MiscHandler.cpp
View File

@@ -625,18 +625,21 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket& recvData)
if (!player->IsResurrectRequestedBy(guid))
return;
if (InstanceScript* instance = player->GetInstanceScript())
if (Player* resurrectingPlayer = ObjectAccessor::GetPlayer(*player, guid))
{
if (instance->IsEncounterInProgress() && player->GetMap()->IsRaid())
if (InstanceScript* instance = resurrectingPlayer->GetInstanceScript())
{
if (!instance->GetCombatResurrectionCharges())
return;
else
instance->UseCombatResurrection();
if (instance->IsEncounterInProgress() && resurrectingPlayer->GetMap()->IsRaid())
{
if (!instance->GetCombatResurrectionCharges())
return;
else
instance->UseCombatResurrection();
}
}
}
GetPlayer()->ResurrectUsingRequestData();
player->ResurrectUsingRequestData();
}
void WorldSession::SendAreaTriggerMessage(char const* Text, ...)

4
src/server/game/Instances/InstanceScript.cpp
View File

@@ -838,11 +838,11 @@ void InstanceScript::UpdatePhasing()
void InstanceScript::InitializeCombatResurrections()
{
if (instance->IsRaid())
_combatResurrectionCharges = instance->Is25ManRaid() ? 3 : 1;
_combatResurrectionCharges = instance->Is25ManRaid() ? 3 : 1;
}
void InstanceScript::UseCombatResurrection()
{
_combatResurrectionCharges--;
_combatResurrectionCharges--;
SendEncounterUnit(ENCOUNTER_FRAME_ADD_COMBAT_RES_LIMIT);
}

2
src/server/game/Instances/InstanceScript.h
View File

@@ -314,7 +314,7 @@ class TC_GAME_API InstanceScript : public ZoneScript
ObjectInfoMap _gameObjectInfo;
ObjectGuidMap _objectGuids;
uint32 completedEncounters; // completed encounter mask, bit indexes are DungeonEncounter.dbc boss numbers, used for packets
uint8 _combatResurrectionCharges; // the counter for available battle resurrections
uint8 _combatResurrectionCharges; // the counter for available combat resurrections
std::unordered_set<uint32> _activatedAreaTriggers;
std::vector<InstanceSpawnGroupInfo> const* const _instanceSpawnGroups;