nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-03-15 05:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/GameObjects): move activation code of traps to GO_ACTIVATED (#10537)

Browse Source 
- Original author: @Gacko
This commit is contained in:
UltraNix
2022-02-19 22:26:26 +01:00
committed by GitHub
parent c9586a106b
commit 982be6de00
3 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -651,7 +651,10 @@ void Creature::Update(uint32 diff)
m_groupLootTimer = 0; m_groupLootTimer = 0;
lootingGroupLowGUID = 0; lootingGroupLowGUID = 0;
} }
else m_groupLootTimer -= diff; else
{
m_groupLootTimer -= diff;
}
} }
else if (m_corpseRemoveTime <= GameTime::GetGameTime().count()) else if (m_corpseRemoveTime <= GameTime::GetGameTime().count())
{ {

68
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -651,15 +651,10 @@ void GameObject::Update(uint32 diff)
// Type 2 - Bomb (will go away after casting it's spell) // Type 2 - Bomb (will go away after casting it's spell)
if (goInfo->trap.type == 2) if (goInfo->trap.type == 2)
{ {
if (goInfo->trap.spellId) SetLootState(GO_ACTIVATED);
CastSpell(nullptr, goInfo->trap.spellId); // FIXME: null target won't work for target type 1
SetLootState(GO_JUST_DEACTIVATED);
break; break;
} }
// Type 0 despawns after being triggered, type 1 does not.
bool isBattlegroundTrap = false;
/// @todo This is activation radius. Casting radius must be selected from spell data. /// @todo This is activation radius. Casting radius must be selected from spell data.
/// @todo Move activated state code to GO_ACTIVATED, in this place just check for activation and set state. /// @todo Move activated state code to GO_ACTIVATED, in this place just check for activation and set state.
float radius = float(goInfo->trap.diameter) * 0.5f; float radius = float(goInfo->trap.diameter) * 0.5f;
@@ -667,10 +662,10 @@ void GameObject::Update(uint32 diff)
{ {
// Cast in other case (at some triggering/linked go/etc explicit call) // Cast in other case (at some triggering/linked go/etc explicit call)
if (goInfo->trap.cooldown != 3 || m_respawnTime > 0) if (goInfo->trap.cooldown != 3 || m_respawnTime > 0)
{
break; break;
}
// Battleground gameobjects have data2 == 0 && data5 == 3
isBattlegroundTrap = true;
radius = 3.f; radius = 3.f;
} }
@@ -699,22 +694,7 @@ void GameObject::Update(uint32 diff)
if (target) if (target)
{ {
// some traps do not have spell but should be triggered SetLootState(GO_ACTIVATED, target);
if (goInfo->trap.spellId)
CastSpell(target, goInfo->trap.spellId);
m_cooldownTime = GameTime::GetGameTimeMS().count() + (goInfo->trap.cooldown ? goInfo->trap.cooldown : uint32(4)) * IN_MILLISECONDS; // template or 4 seconds
if (goInfo->trap.type == 1)
SetLootState(GO_JUST_DEACTIVATED);
if (isBattlegroundTrap && target->GetTypeId() == TYPEID_PLAYER)
{
// battleground gameobjects case
if (target->ToPlayer()->InBattleground())
if (Battleground* bg = target->ToPlayer()->GetBattleground())
bg->HandleTriggerBuff(this);
}
} }
} }
else if (uint32 max_charges = goInfo->GetCharges()) else if (uint32 max_charges = goInfo->GetCharges())
@@ -757,8 +737,41 @@ void GameObject::Update(uint32 diff)
m_groupLootTimer = 0; m_groupLootTimer = 0;
lootingGroupLowGUID = 0; lootingGroupLowGUID = 0;
} }
else m_groupLootTimer -= diff; else
{
m_groupLootTimer -= diff;
}
} }
break;
case GAMEOBJECT_TYPE_TRAP:
{
GameObjectTemplate const* goInfo = GetGOInfo();
if (goInfo->trap.type == 2)
{
if (goInfo->trap.spellId)
CastSpell(nullptr, goInfo->trap.spellId); // FIXME: null target won't work for target type 1
SetLootState(GO_JUST_DEACTIVATED);
}
else if (Unit* target = ObjectAccessor::GetUnit(*this, _lootStateUnitGUID))
{
if (goInfo->trap.spellId)
CastSpell(target, goInfo->trap.spellId);
m_cooldownTime = GameTime::GetGameTimeMS().count() + (goInfo->trap.cooldown ? goInfo->trap.cooldown : uint32(4)) * IN_MILLISECONDS; // template or 4 seconds
if (goInfo->trap.type == 1)
SetLootState(GO_JUST_DEACTIVATED);
else if (!goInfo->trap.type)
SetLootState(GO_READY);
// Battleground gameobjects have data2 == 0 && data5 == 3
if (!goInfo->trap.diameter && goInfo->trap.cooldown == 3)
if (Player* player = target->ToPlayer())
if (Battleground* bg = player->GetBattleground())
bg->HandleTriggerBuff(this);
}
break;
}
default: default:
break; break;
} }
@@ -2366,6 +2379,11 @@ void GameObject::SetLootState(LootState state, Unit* unit)
{ {
m_lootState = state; m_lootState = state;
if (unit)
_lootStateUnitGUID = unit->GetGUID();
else
_lootStateUnitGUID.Clear();
AI()->OnStateChanged(state, unit); AI()->OnStateChanged(state, unit);
sScriptMgr->OnGameObjectLootStateChanged(this, state, unit); sScriptMgr->OnGameObjectLootStateChanged(this, state, unit);
// pussywizard: lootState has nothing to do with collision, it depends entirely on GOState. Loot state is for timed close/open door and respawning, which then sets GOState // pussywizard: lootState has nothing to do with collision, it depends entirely on GOState. Loot state is for timed close/open door and respawning, which then sets GOState

2
src/server/game/Entities/GameObject/GameObject.h
View File

@@ -1021,6 +1021,8 @@ protected:
ObjectGuid m_linkedTrap; ObjectGuid m_linkedTrap;
ObjectGuid _lootStateUnitGUID;
private: private:
void CheckRitualList(); void CheckRitualList();
void ClearRitualList(); void ClearRitualList();