Merge branch 'Bot_Raid_work' of https://github.com/neckkola/Server into Bot_Raid_work

zone/bot.cpp

@@ -3994,7 +3994,15 @@ void Bot::Depop() {
 	entity_list.RemoveFromHateLists(this);
 	if(HasGroup())
 		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())
 		GetPet()->Depop();
 
@@ -8426,14 +8434,7 @@ void Bot::Camp(bool databaseSave) {
 	if(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)

zone/client_packet.cpp

@@ -587,6 +587,7 @@ void Client::CompleteConnect()
 							if (b)
 							{
 								b->SetRaidGrouped(true);
+								b->p_raid_instance = raid;
 								//b->SetFollowID(this->GetID());
 							}
 						}

zone/raids.cpp

@@ -209,6 +209,7 @@ void Raid::AddBot(Bot* b, uint32 group, bool rleader, bool groupleader, bool loo
 	SendRaidAddAll(b->GetName());
 	
 	b->SetRaidGrouped(true);
+	b->p_raid_instance = this;
 	//SendRaidMOTD(b->GetOwner()->CastToClient());
 
 	// Mitch What to do here?