mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 10:37:02 +00:00
Merge commit 'origin/master' into 330
This commit is contained in:
commit
3e934e4d02
37 changed files with 361 additions and 300 deletions
|
|
@ -1757,11 +1757,12 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
|
|||
}
|
||||
GetSession()->SendPacket( &data );
|
||||
SendSavedInstances();
|
||||
|
||||
// remove from old map now
|
||||
if(oldmap) oldmap->Remove(this, false);
|
||||
}
|
||||
|
||||
// remove from old map now
|
||||
if(oldmap)
|
||||
oldmap->Remove(this, false);
|
||||
|
||||
// new final coordinates
|
||||
float final_x = x;
|
||||
float final_y = y;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue