aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
authorTrisjdc <trisjdc@gmail.com>2014-06-03 00:57:36 +0100
committerTrisjdc <trisjdc@gmail.com>2014-06-03 00:57:36 +0100
commit18868f5cbdd55baa95cd5d5c56d77926ae7f1f9c (patch)
treefc9827883c27dedb537b3e2edfce2003c17c3d47 /src/server/game/Entities
parent409a19e623d63ff868ec118fcafc107dd4fb10ca (diff)
Core/Maps: Allow logging players to enter in instances that have an encounter in progress
Diffstat (limited to 'src/server/game/Entities')
-rw-r--r--src/server/game/Entities/Player/Player.cpp5
-rw-r--r--src/server/game/Entities/Player/Player.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 433551104b9..eeb72b16f07 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -26757,3 +26757,8 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy
return pet;
}
+
+bool Player::IsLoading() const
+{
+ return GetSession()->PlayerLoading();
+}
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 52674032c0a..94175834969 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2303,6 +2303,8 @@ class Player : public Unit, public GridObject<Player>
std::string GetMapAreaAndZoneString();
std::string GetCoordsMapAreaAndZoneString();
+ bool IsLoading() const;
+
protected:
// Gamemaster whisper whitelist
WhisperListContainer WhisperList;