mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-25 02:08:23 +00:00
Final - Bot Raid Working
This commit is contained in:
+8
-9
@@ -3995,14 +3995,6 @@ void Bot::Depop() {
|
|||||||
if(HasGroup())
|
if(HasGroup())
|
||||||
Bot::RemoveBotFromGroup(this, GetGroup());
|
Bot::RemoveBotFromGroup(this, GetGroup());
|
||||||
|
|
||||||
//Mitch
|
|
||||||
Raid* bot_raid = entity_list.GetRaidByBotName(this->GetName());
|
|
||||||
if (bot_raid) {
|
|
||||||
uint32 gid = bot_raid->GetGroup(this->GetName());
|
|
||||||
bot_raid->SendRaidGroupRemove(this->GetName(), bot_raid->GetGroup(this->GetName()));
|
|
||||||
bot_raid->RemoveMember(this->GetName());
|
|
||||||
bot_raid->GroupUpdate(gid);
|
|
||||||
}
|
|
||||||
if(HasPet())
|
if(HasPet())
|
||||||
GetPet()->Depop();
|
GetPet()->Depop();
|
||||||
|
|
||||||
@@ -8434,7 +8426,14 @@ void Bot::Camp(bool databaseSave) {
|
|||||||
if(GetGroup())
|
if(GetGroup())
|
||||||
RemoveBotFromGroup(this, GetGroup());
|
RemoveBotFromGroup(this, GetGroup());
|
||||||
|
|
||||||
|
//Mitch
|
||||||
|
Raid* bot_raid = entity_list.GetRaidByBotName(this->GetName());
|
||||||
|
if (bot_raid) {
|
||||||
|
uint32 gid = bot_raid->GetGroup(this->GetName());
|
||||||
|
bot_raid->SendRaidGroupRemove(this->GetName(), bot_raid->GetGroup(this->GetName()));
|
||||||
|
bot_raid->RemoveMember(this->GetName());
|
||||||
|
bot_raid->GroupUpdate(gid);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// RemoveBotFromGroup() code is too complicated for this to work as-is (still needs to be addressed to prevent memory leaks)
|
// RemoveBotFromGroup() code is too complicated for this to work as-is (still needs to be addressed to prevent memory leaks)
|
||||||
|
|||||||
Reference in New Issue
Block a user