Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/worldserver/worldserver.conf.dist
This commit is contained in:
commit
85e49d0d14
9 files changed
+64
-28
No files matched your search
@@ -1991,10 +1991,22 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo)
|
||||
|
||||
if (SendMsgTo)
|
||||
{
|
||||
if (isEmpty)
|
||||
SendMsgTo->SendResetInstanceSuccess(instanceSave->GetMapId());
|
||||
else
|
||||
if (!isEmpty)
|
||||
SendMsgTo->SendResetInstanceFailed(0, instanceSave->GetMapId());
|
||||
else if (sWorld->getBoolConfig(CONFIG_INSTANCES_RESET_ANNOUNCE))
|
||||
{
|
||||
if (Group* group = SendMsgTo->GetGroup())
|
||||
{
|
||||
for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
|
||||
if (Player* player = itr->GetSource())
|
||||
player->SendResetInstanceSuccess(instanceSave->GetMapId());
|
||||
}
|
||||
|
||||
else
|
||||
SendMsgTo->SendResetInstanceSuccess(instanceSave->GetMapId());
|
||||
}
|
||||
else
|
||||
SendMsgTo->SendResetInstanceSuccess(instanceSave->GetMapId());
|
||||
}
|
||||
|
||||
if (isEmpty || method == INSTANCE_RESET_GROUP_DISBAND || method == INSTANCE_RESET_CHANGE_DIFFICULTY)
|
||||
|
||||
Reference in new issue
Block a user