Core/Creatures: Fixed mistake in merge conflict resolution in d144724

Shauren · Shauren · commit 4a6ede167fd3 · 2025-10-09T19:20:54.000+02:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ m_timer(0), m_lifetime(0), m_canFollowOwner(true)`
`38`	`38`
`39`	`39`	`WorldObject* TempSummon::GetSummoner() const`
`40`	`40`	`{`
`41`		`- return !m_summonerGUID.IsEmpty() ? ObjectAccessor::GetUnit(*this, m_summonerGUID) : nullptr;`
	`41`	`+ return !m_summonerGUID.IsEmpty() ? ObjectAccessor::GetWorldObject(*this, m_summonerGUID) : nullptr;`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`Unit* TempSummon::GetSummonerUnit() const`