From 7763d408462be494715cea4b90c8174fb03c2d5a Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 24 Oct 2016 14:06:59 +0200 Subject: [PATCH] =?UTF-8?q?Core/Unit:=20prematurely=20abort=20GetFactionTe?= =?UTF-8?q?mplateEntry=20instead=20of=20retur=E2=80=A6=20=E2=80=A6ning=20a?= =?UTF-8?q?=20null=20pointer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Factions should never be invalid for players/spawned creatures anyways --- src/server/game/Entities/Unit/Unit.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index d8eb3e55939..fe2ab8dbf9d 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7490,6 +7490,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; }