CSE_AlifeOnlineOfflineGroup: switch_online/switch_offline. Verify mem…

…bers are offline before adding online and visa versa. If a specific member is already online (from scripting needs) and add_online is called it will cause crash with duplicate ID error since it net_spawns twice.
OpenXRay · Sep 10, 2016 · 9ea54f9 · 9ea54f9
1 parent 3724022
commit 9ea54f9
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/xrGame/alife_online_offline_group.cpp b/src/xrGame/alife_online_offline_group.cpp
@@ -231,7 +231,8 @@ void CSE_ALifeOnlineOfflineGroup::switch_online			()
 	MEMBERS::iterator			I = m_members.begin();
 	MEMBERS::iterator			E = m_members.end();
 	for ( ; I != E; ++I){
-		alife().add_online		((*I).second, false);
+		if ((*I).second->m_bOnline == false)
+			alife().add_online((*I).second, false);
 	}
 
 	alife().scheduled().remove	(this);
@@ -257,8 +258,11 @@ void CSE_ALifeOnlineOfflineGroup::switch_offline		()
 	MEMBERS::iterator			I = m_members.begin();
 	MEMBERS::iterator			E = m_members.end();
 	for ( ; I != E; ++I){
-		(*I).second->clear_client_data();
-		alife().remove_online		((*I).second, false);
+		if ((*I).second->m_bOnline == true)
+		{
+			(*I).second->clear_client_data();
+			alife().remove_online		((*I).second, false);
+		}
 	}
 
 	alife().scheduled().add		(this);