Fixed potential endless quest loop with EVENT_COMBAT and WipeHateList().

This commit is contained in:
Trevius 2014-04-01 23:00:15 -05:00
parent 8866b3170e
commit bb541eeb60
2 changed files with 7 additions and 1 deletions

View File

@ -5,6 +5,7 @@ demonstar55: Implemented ability for a merchant to open and close shop.
Lua quest functions: e.self:MerchantOpenShop() and e.self:MerchantCloseShop() Lua quest functions: e.self:MerchantOpenShop() and e.self:MerchantCloseShop()
GM Commands: #merchant_open_shop (short: #open_shop) and #merchant_close_shop (short: #close_shop) GM Commands: #merchant_open_shop (short: #open_shop) and #merchant_close_shop (short: #close_shop)
default to status 100, just in case you need to force the merchants status default to status 100, just in case you need to force the merchants status
Trevius: Fixed potential endless quest loop with EVENT_COMBAT and WipeHateList().
== 03/31/2014 == == 03/31/2014 ==
Uleat: Fix for unconscious skillups. Uleat: Fix for unconscious skillups.

View File

@ -2450,14 +2450,19 @@ bool Mob::RemoveFromHateList(Mob* mob)
return bFound; return bFound;
} }
void Mob::WipeHateList() void Mob::WipeHateList()
{ {
if(IsEngaged()) if(IsEngaged())
{ {
hate_list.Wipe();
AI_Event_NoLongerEngaged(); AI_Event_NoLongerEngaged();
} }
else
{
hate_list.Wipe(); hate_list.Wipe();
} }
}
uint32 Mob::RandomTimer(int min,int max) { uint32 Mob::RandomTimer(int min,int max) {
int r = 14000; int r = 14000;