aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2025-10-09 19:20:54 +0200
committerShauren <shauren.trinity@gmail.com>2025-10-09 19:20:54 +0200
commit4a6ede167fd3adc37bbd25458e15690abf23fc3b (patch)
treeb88e1d8fb0718cc4cf1bd947960cd7e011d7d4f2 /src/server
parentfa061c8c5400aefe88965a663fc53a7e63990c43 (diff)
Core/Creatures: Fixed mistake in merge conflict resolution in d144724e2fd8a74a3e896751dc9c866b3932f815
Diffstat (limited to 'src/server')
-rw-r--r--src/server/game/Entities/Creature/TemporarySummon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
index bbc942d942a..cd3c0b99691 100644
--- a/src/server/game/Entities/Creature/TemporarySummon.cpp
+++ b/src/server/game/Entities/Creature/TemporarySummon.cpp
@@ -38,7 +38,7 @@ m_timer(0), m_lifetime(0), m_canFollowOwner(true)
WorldObject* TempSummon::GetSummoner() const
{
- return !m_summonerGUID.IsEmpty() ? ObjectAccessor::GetUnit(*this, m_summonerGUID) : nullptr;
+ return !m_summonerGUID.IsEmpty() ? ObjectAccessor::GetWorldObject(*this, m_summonerGUID) : nullptr;
}
Unit* TempSummon::GetSummonerUnit() const