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

Core/Gameobject: fixed sometimes not found linked trap

Browse Source 
Closes #18256

(cherry picked from commit 400a69bf9e)

# Conflicts:
#	src/server/game/Entities/GameObject/GameObject.cpp
This commit is contained in:
ariel-
2016-11-16 04:59:43 -03:00
committed by joschiwald
parent acdc2d6d63
commit 6d246e4a0a
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1221,18 +1221,8 @@ void GameObject::TriggeringLinkedGameObject(uint32 trapEntry, Unit* target)
if (!trapSpell) // checked at load already
return;
float range = float(target->GetSpellMaxRangeForTarget(GetOwner(), trapSpell));
// search nearest linked GO
GameObject* trapGO = nullptr;
// using original GO distance
Trinity::NearestGameObjectEntryInObjectRangeCheck go_check(*target, trapEntry, range);
Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck> checker(this, trapGO, go_check);
Cell::VisitGridObjects(this, checker, range);
// found correct GO
if (trapGO)
trapGO->CastSpell(target, trapInfo->trap.spell);
if (GameObject* trapGO = GetLinkedTrap())
trapGO->CastSpell(target, trapSpell->Id);
}
GameObject* GameObject::LookupFishingHoleAround(float range)