aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Player
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2015-08-09 17:23:56 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2015-08-09 17:23:56 +0200
commit57eae1dc13b5e5e4b841d826deed0d13cd6f2d1b (patch)
tree7dd5288796e37a7795070fce44e326fb25b3f955 /src/server/game/Entities/Player
parent590c6e399d778db459fc8417322c80549081440a (diff)
Core/Instances: Added ResetFailedReason enum for 6.2.0
Diffstat (limited to 'src/server/game/Entities/Player')
-rw-r--r--src/server/game/Entities/Player/Player.cpp4
-rw-r--r--src/server/game/Entities/Player/Player.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 4165728ae7d..5b6003bf166 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -20089,7 +20089,7 @@ void Player::SendResetInstanceSuccess(uint32 MapId)
GetSession()->SendPacket(data.Write());
}
-void Player::SendResetInstanceFailed(uint32 reason, uint32 MapId)
+void Player::SendResetInstanceFailed(ResetFailedReason reason, uint32 mapID)
{
/*reasons for instance reset failure:
// 0: There are players inside the instance.
@@ -20098,7 +20098,7 @@ void Player::SendResetInstanceFailed(uint32 reason, uint32 MapId)
*/
WorldPackets::Instance::InstanceResetFailed data;
- data.MapID = MapId;
+ data.MapID = mapID;
data.ResetFailedReason = reason;
GetSession()->SendPacket(data.Write());
}
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 50c2852ba6e..4218a058798 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2142,7 +2142,7 @@ class Player : public Unit, public GridObject<Player>
void SendRaidDifficulty(bool legacy, int32 forcedDifficulty = -1);
void ResetInstances(uint8 method, bool isRaid, bool isLegacy);
void SendResetInstanceSuccess(uint32 MapId);
- void SendResetInstanceFailed(uint32 reason, uint32 MapId);
+ void SendResetInstanceFailed(ResetFailedReason reason, uint32 mapID);
void SendResetFailedNotify(uint32 mapid);
virtual bool UpdatePosition(float x, float y, float z, float orientation, bool teleport = false) override;