From bcc470ac43a9cf24e22ba9419fa7b61bfbae4f7d Mon Sep 17 00:00:00 2001 From: Klark20 Date: Fri, 16 Dec 2011 01:32:55 +0100 Subject: [PATCH] [11864] Fix SCRIPT_COMMAND_SET_FACTION to check for expected Faction Templates and not factions Please check your scripts! Note: Similar problems exist in other cases as well. Signed-off-by: Klark20 Signed-off-by: Schmoozerd --- src/game/ScriptMgr.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp index 78ca52456..d8200bec3 100644 --- a/src/game/ScriptMgr.cpp +++ b/src/game/ScriptMgr.cpp @@ -421,9 +421,9 @@ void ScriptMgr::LoadScripts(ScriptMapMap& scripts, const char* tablename) } case SCRIPT_COMMAND_SET_FACTION: { - if (tmp.faction.factionId && !sFactionStore.LookupEntry(tmp.faction.factionId)) + if (tmp.faction.factionId && !sFactionTemplateStore.LookupEntry(tmp.faction.factionId)) { - sLog.outErrorDb("Table `%s` has datalong2 = %u in SCRIPT_COMMAND_SET_FACTION for script id %u, but this faction does not exist.", tablename, tmp.faction.factionId, tmp.id); + sLog.outErrorDb("Table `%s` has datalong = %u in SCRIPT_COMMAND_SET_FACTION for script id %u, but this faction-template does not exist.", tablename, tmp.faction.factionId, tmp.id); continue; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index eb63eb026..a724ca5f0 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11863" + #define REVISION_NR "11864" #endif // __REVISION_NR_H__