pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-05 23:56:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/eqemu-api-data-service-netstats-ws

Browse Source
This commit is contained in:
KimLS
2019-05-16 14:38:12 -07:00
parent 5936d865b5 ad790ac8ef
commit e277e55718
30 changed files with 312 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zonedb.cpp
+3 -1
View File
@@ -2498,7 +2498,8 @@ const NPCType* ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load
"npc_types.charm_atk, "
"npc_types.skip_global_loot, "
"npc_types.rare_spawn, "
"npc_types.stuck_behavior "
"npc_types.stuck_behavior, "
"npc_types.model "
"FROM npc_types %s",
where_condition.c_str()
);
@@ -2688,6 +2689,7 @@ const NPCType* ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load
temp_npctype_data->skip_global_loot = atoi(row[107]) != 0;
temp_npctype_data->rare_spawn = atoi(row[108]) != 0;
temp_npctype_data->stuck_behavior = atoi(row[109]);
temp_npctype_data->use_model = atoi(row[110]);
// If NPC with duplicate NPC id already in table,
// free item we attempted to add.