ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

feat (core): Add Teleport Helpers (#10611)

Browse source 
* feat (core): Add Teleport Helpers

* Lower case the things
This commit is contained in:
acidmanifesto 2022-02-09 20:54:46 -05:00 • committed by GitHub
parent 759b945a13
commit c50f7feda0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/server/game/Entities/Player/Player.cpp
View file

@ -220,6 +220,7 @@ Player::Player(WorldSession* session): Unit(true), m_mover(this)
m_bMustDelayTeleport = false;
m_bHasDelayedTeleport = false;
teleportStore_options = 0;
m_canTeleport = false;
m_trade = nullptr;
@ -1463,6 +1464,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
// near teleport, triggering send MSG_MOVE_TELEPORT_ACK from client at landing
if (!GetSession()->PlayerLogout())
{
SetCanTeleport(true);
Position oldPos = GetPosition();
Relocate(x, y, z, orientation);
SendTeleportAckPacket();
@ -1565,6 +1567,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
if (!GetSession()->PlayerLogout())
{
SetCanTeleport(true);
WorldPacket data(SMSG_NEW_WORLD, 4 + 4 + 4 + 4 + 4);
data << uint32(mapid);
if (m_transport)

4
src/server/game/Entities/Player/Player.h
View file

@ -2443,6 +2443,9 @@ public:
void SetMap(Map* map) override;
void ResetMap() override;
bool CanTeleport() { return m_canTeleport; }
void SetCanTeleport(bool value) { m_canTeleport = value; }
bool isAllowedToLoot(const Creature* creature);
[[nodiscard]] DeclinedName const* GetDeclinedNames() const { return m_declinedname; }
@ -2896,6 +2899,7 @@ private:
uint32 m_DelayedOperations;
bool m_bMustDelayTeleport;
bool m_bHasDelayedTeleport;
bool m_canTeleport;
std::unique_ptr<PetStable> m_petStable;