pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-30 17:58:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a zone crash related to numhits for spells.

Browse Source 
Fixed a query related to group leaders logging in.
Fixed a world crash related to attempting to join an adventure with Mercenaries.
This commit is contained in:
Trevius
2014-11-28 20:23:42 -06:00
parent b7c19e4034
commit 84fa042c75
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/adventure.cpp
+11 -6
View File
@@ -54,10 +54,10 @@ void Adventure::AddPlayer(std::string character_name, bool add_client_to_instanc
{
if(!PlayerExists(character_name))
{
int client_id = database.GetCharacterID(character_name.c_str());
if(add_client_to_instance)
int32 character_id = database.GetCharacterID(character_name.c_str());
if(character_id && add_client_to_instance)
{
database.AddClientToInstance(instance_id, client_id);
database.AddClientToInstance(instance_id, character_id);
}
players.push_back(character_name);
}
@@ -68,11 +68,16 @@ void Adventure::RemovePlayer(std::string character_name)
std::list<std::string>::iterator iter = players.begin();
while(iter != players.end())
{
if((*iter).compare(character_name) == 0)
{
database.RemoveClientFromInstance(instance_id, database.GetCharacterID(character_name.c_str()));
players.erase(iter);
return;
int32 character_id = database.GetCharacterID(character_name.c_str());
if (character_id)
{
database.RemoveClientFromInstance(instance_id, character_id);
players.erase(iter);
return;
}
}
++iter;
}