Loading...   


 zone/npc.cpp                     |  7 +++++--
 zone/quest_parser_collection.cpp | 11 +++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/zone/npc.cpp b/zone/npc.cpp
index 9d39f4a..798847e 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -852,11 +852,11 @@ bool NPC::SpawnZoneController(){
 	npc_type->cur_hp = 2000000000;
 	npc_type->max_hp = 2000000000;
 	npc_type->race = 240;
-	npc_type->gender = 0;
+	npc_type->gender = 2;
 	npc_type->class_ = 1;
 	npc_type->deity = 1;
 	npc_type->level = 200;
-	npc_type->npc_id = 0;
+	npc_type->npc_id = 10;
 	npc_type->loottable_id = 0;
 	npc_type->texture = 3;
 	npc_type->runspeed = 0;
@@ -868,6 +868,9 @@ bool NPC::SpawnZoneController(){
 	npc_type->prim_melee_type = 28;
 	npc_type->sec_melee_type = 28;
 
+	npc_type->findable = 0;
+	npc_type->trackable = 0;
+
 	strcpy(npc_type->special_abilities, "12,1^13,1^14,1^15,1^16,1^17,1^19,1^22,1^24,1^25,1^28,1^31,1^35,1^39,1^42,1");
 
 	glm::vec4 point;
diff --git a/zone/quest_parser_collection.cpp b/zone/quest_parser_collection.cpp
index 1f4f99c..ec8884d 100644
--- a/zone/quest_parser_collection.cpp
+++ b/zone/quest_parser_collection.cpp
@@ -484,10 +484,17 @@ QuestInterface *QuestParserCollection::GetQIByNPCQuest(uint32 npcid, std::string
 
 	//second look for /quests/zone/npcname.ext (precedence)
 	const NPCType *npc_type = database.LoadNPCTypesData(npcid);
-	if(!npc_type) {
+	if(!npc_type && npcid != 10) {
 		return nullptr;
 	}
-	std::string npc_name = npc_type->name;
+
+	std::string npc_name;
+	if (npcid == 10){
+		npc_name = "zone_controller";
+	}
+	else{
+		npc_name = npc_type->name;
+	} 
 	int sz = static_cast<int>(npc_name.length());
 	for(int i = 0; i < sz; ++i) {
 		if(npc_name[i] == '`') {

Raw Paste Data