pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests fix + fix for certain factions not loading

Browse Source
This commit is contained in:
KimLS
2013-02-28 22:33:20 -08:00
parent 7237c1f54c
commit b5405c35e2
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/shareddb.cpp
+5 -1
View File
@@ -1118,7 +1118,7 @@ void SharedDatabase::LoadNPCFactionLists(void *data, uint32 size, uint32 list_co
EQEmu::FixedMemoryHashSet<NPCFactionList> hash(reinterpret_cast<uint8*>(data), size, list_count, max_lists);
const char *query = "SELECT npc_faction.id, npc_faction.primaryfaction, npc_faction.ignore_primary_assist, "
"npc_faction_entries.faction_id, npc_faction_entries.value, npc_faction_entries.npc_value, npc_faction_entries.temp "
"FROM npc_faction JOIN npc_faction_entries ON npc_faction.id = npc_faction_entries.npc_faction_id ORDER BY "
"FROM npc_faction LEFT JOIN npc_faction_entries ON npc_faction.id = npc_faction_entries.npc_faction_id ORDER BY "
"npc_faction.id;";
char errbuf[MYSQL_ERRMSG_SIZE];
@@ -1144,6 +1144,10 @@ void SharedDatabase::LoadNPCFactionLists(void *data, uint32 size, uint32 list_co
faction.assistprimaryfaction = (atoi(row[2]) == 0);
}
if(!row[3]) {
continue;
}
if(current_entry >= MAX_NPC_FACTIONS) {
continue;
}