From b57ea937eeca0be6a90ef9d95c597beba21352e6 Mon Sep 17 00:00:00 2001 From: dude22072 Date: Wed, 23 Feb 2022 02:10:54 -0600 Subject: [PATCH] Update GaiUsb604.cpp --- .../quest/subquest/coerthas_central/GaiUsb604.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp index bf1ab5eb..9c7f65fe 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp @@ -4,6 +4,7 @@ #include "Manager/EventMgr.h" #include +#include #include #include @@ -104,9 +105,9 @@ public: } } - void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override + void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override { - switch( entityId ) + switch( bnpc.getLayoutId() ) { case Enemy0: case Enemy1: @@ -172,8 +173,8 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() ); - auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() ); + auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() ); + auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() ); enemy0->hateListAdd( player.getAsPlayer(), 1 ); enemy1->hateListAdd( player.getAsPlayer(), 1 );