diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/database/Database/Implementation/CharacterDatabase.cpp | 1 | ||||
| -rw-r--r-- | src/server/database/Database/Implementation/CharacterDatabase.h | 1 | ||||
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 34 |
3 files changed, 36 insertions, 0 deletions
diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp index 6653dff3ad3..2141121aa77 100644 --- a/src/server/database/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/database/Database/Implementation/CharacterDatabase.cpp @@ -410,6 +410,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PrepareStatement(CHAR_DEL_CHARACTER_SOCIAL, "DELETE FROM character_social WHERE guid = ? AND friend = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_UPD_CHARACTER_SOCIAL_NOTE, "UPDATE character_social SET note = ? WHERE guid = ? AND friend = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_UPD_CHARACTER_POSITION, "UPDATE characters SET position_x = ?, position_y = ?, position_z = ?, orientation = ?, map = ?, zone = ?, trans_x = 0, trans_y = 0, trans_z = 0, transguid = 0, taxi_path = '', cinematic = 1 WHERE guid = ?", CONNECTION_ASYNC); + PrepareStatement(CHAR_UPD_CHARACTER_POSITION_BY_MAPID, "UPDATE characters SET position_x = ?, position_y = ?, position_z = ?, orientation = ?, map = ?, zone = ?, trans_x = 0, trans_y = 0, trans_z = 0, transguid = 0, taxi_path = '', cinematic = 1 WHERE guid = ? AND map = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_SEL_CHARACTER_AURA_FROZEN, "SELECT characters.name, character_aura.remainTime FROM characters LEFT JOIN character_aura ON (characters.guid = character_aura.guid) WHERE character_aura.spell = 9454", CONNECTION_SYNCH); PrepareStatement(CHAR_SEL_CHARACTER_ONLINE, "SELECT name, account, map, zone FROM characters WHERE online > 0", CONNECTION_SYNCH); PrepareStatement(CHAR_SEL_CHAR_DEL_INFO_BY_GUID, "SELECT guid, deleteInfos_Name, deleteInfos_Account, deleteDate FROM characters WHERE deleteDate IS NOT NULL AND guid = ?", CONNECTION_SYNCH); diff --git a/src/server/database/Database/Implementation/CharacterDatabase.h b/src/server/database/Database/Implementation/CharacterDatabase.h index 20727eafc45..2951eff15ca 100644 --- a/src/server/database/Database/Implementation/CharacterDatabase.h +++ b/src/server/database/Database/Implementation/CharacterDatabase.h @@ -335,6 +335,7 @@ enum CharacterDatabaseStatements : uint32 CHAR_DEL_CHARACTER_SOCIAL, CHAR_UPD_CHARACTER_SOCIAL_NOTE, CHAR_UPD_CHARACTER_POSITION, + CHAR_UPD_CHARACTER_POSITION_BY_MAPID, CHAR_INS_LFG_DATA, CHAR_DEL_LFG_DATA, diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 24bc91aad16..b46fe069cfb 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -2172,7 +2172,41 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo) { // do not reset the instance, just unbind if others are permanently bound to it if (isEmpty && instanceSave->CanReset()) + { + if (map && this->isRaidGroup() && map->IsDungeon() && SendMsgTo) + { + AreaTrigger const * const instanceEntrance = sObjectMgr->GetGoBackTrigger(map->GetId()); + + if (!instanceEntrance) + TC_LOG_DEBUG("root", "Instance entrance not found for maps %u", map->GetId()); + else + { + WorldSafeLocsEntry const * graveyardLocation = sObjectMgr->GetClosestGraveyard(instanceEntrance->target_X, instanceEntrance->target_Y, instanceEntrance->target_Z, instanceEntrance->target_mapId, SendMsgTo->GetTeam());; + uint32 const zoneId = sMapMgr->GetZoneId(graveyardLocation->map_id, graveyardLocation->x, graveyardLocation->y, graveyardLocation->z); + + for (const MemberSlot &member : this->GetMemberSlots()) + { + if (!ObjectAccessor::FindConnectedPlayer(member.guid)) + { + PreparedStatement *stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHARACTER_POSITION_BY_MAPID); + + stmt->setFloat(0, graveyardLocation->x); + stmt->setFloat(1, graveyardLocation->y); + stmt->setFloat(2, graveyardLocation->z); + stmt->setFloat(3, instanceEntrance->target_Orientation); + stmt->setUInt32(4, graveyardLocation->map_id); + stmt->setUInt32(5, zoneId); + stmt->setUInt32(6, member.guid); + stmt->setUInt32(7, map->GetId()); + + CharacterDatabase.Execute(stmt); + } + } + } + } + instanceSave->DeleteFromDB(); + } else { PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GROUP_INSTANCE_BY_INSTANCE); |