diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2015-08-09 17:27:48 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2015-08-09 17:27:48 +0200 |
| commit | edcbe1bf473ba033a5ae3577a06740f788d0d6a7 (patch) | |
| tree | 223bb5ca562545ce1cc0e0e85dc09c110cdb85bb | |
| parent | 57eae1dc13b5e5e4b841d826deed0d13cd6f2d1b (diff) | |
Core/Instances: Fix order (wrong build) in 57eae1dc13b5e5e4b841d826deed0d13cd6f2d1b
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 0fd083b8d5f..7689f518b10 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -2110,7 +2110,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, bool isLegacy, Player* Sen if (SendMsgTo) { if (!isEmpty) - SendMsgTo->SendResetInstanceFailed(INSTANCE_RESET_FAILED_OFFLINE, instanceSave->GetMapId()); + SendMsgTo->SendResetInstanceFailed(INSTANCE_RESET_FAILED, instanceSave->GetMapId()); else if (sWorld->getBoolConfig(CONFIG_INSTANCES_RESET_ANNOUNCE)) { if (Group* group = SendMsgTo->GetGroup()) diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 506b02225c0..d6f1d240a16 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -4950,9 +4950,9 @@ enum RaidGroupReason enum ResetFailedReason { - INSTANCE_RESET_FAILED_OFFLINE = 0, // "Cannot reset %s. There are players offline in your party." + INSTANCE_RESET_FAILED = 0, // "Cannot reset %s. There are players still inside the instance." INSTANCE_RESET_FAILED_ZONING = 1, // "Cannot reset %s. There are players in your party attempting to zone into an instance." - INSTANCE_RESET_FAILED = 2 // "Cannot reset %s. There are players still inside the instance." + INSTANCE_RESET_FAILED_OFFLINE = 2 // "Cannot reset %s. There are players offline in your party." }; #endif |