Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Transports: undo all custom transport changes as preparation for cherry picks

Browse Source
This commit is contained in:
Ovahlord committed 2022-06-18 18:37:14 +02:00
1 parent 74c60fa456
commit 6e9ec1a4bf
46 files changed
+618 -1469
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Commands/cs_misc.cpp
+4 -8
View File
@@ -283,12 +283,8 @@ public:
object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation());
if (Transport* transport = object->GetTransport())
{
int32 transMapID = -1;
if (transport->GetGoType() == GAMEOBJECT_TYPE_MO_TRANSPORT)
transMapID = transport->GetGOInfo()->moTransport.mapID;
handler->PSendSysMessage(LANG_TRANSPORT_POSITION,
transMapID, object->GetTransOffsetX(), object->GetTransOffsetY(), object->GetTransOffsetZ(), object->GetTransOffsetO(),
transport->GetGOInfo()->moTransport.mapID, object->GetTransOffsetX(), object->GetTransOffsetY(), object->GetTransOffsetZ(), object->GetTransOffsetO(),
transport->GetEntry(), transport->GetName().c_str());
}
handler->PSendSysMessage(LANG_GRID_POSITION,
@@ -456,9 +452,9 @@ public:
// to point to see at target with same orientation
float x, y, z;
target->GetPosition(x, y, z);
target->GetContactPoint(_player, x, y, z);
_player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAngle(target), TELE_TO_GM_MODE, target->GetTransport());
_player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAngle(target), TELE_TO_GM_MODE);
PhasingHandler::InheritPhaseShift(_player, target);
_player->UpdateObjectVisibility();
}
@@ -589,7 +585,7 @@ public:
// before GM
float x, y, z;
_player->GetPosition(x, y, z);
target->TeleportTo(_player->GetMapId(), x, y, z, target->GetOrientation(), 0, _player->GetTransport());
target->TeleportTo(_player->GetMapId(), x, y, z, target->GetOrientation());
PhasingHandler::InheritPhaseShift(target, handler->GetSession()->GetPlayer());
target->UpdateObjectVisibility();
}