diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2016-10-21 12:56:05 -0300 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-10-15 16:16:06 +0200 |
| commit | dc6eef8027a0985e5f95590bd0b10a888d90581a (patch) | |
| tree | 327201e21f79522bb61c967980c3d93b415d4423 | |
| parent | 66e756b52a0f03a34040d79ea889f4ea47f06256 (diff) | |
Core/Unit: prematurely abort GetFactionTemplateEntry instead of returning a null pointer
Factions should never be invalid for players/spawned creatures anyways
Ref #18113
(cherry picked from commit 5f580c9d3d3d34be13e24000c1aeb5640dc4cc27)
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index e3d05356342..40babf7c123 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5230,6 +5230,8 @@ FactionTemplateEntry const* Unit::GetFactionTemplateEntry() const TC_LOG_ERROR("entities.unit", "Creature (template id: %u) has invalid faction (faction template id) #%u", creature->GetCreatureTemplate()->Entry, getFaction()); else TC_LOG_ERROR("entities.unit", "Unit (name=%s, type=%u) has invalid faction (faction template id) #%u", GetName().c_str(), uint32(GetTypeId()), getFaction()); + + ABORT(); } return entry; } |