mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 05:57:45 +00:00
Code Activity

Fix aetheryte.

Browse source
This commit is contained in:
collett 2020-01-03 22:31:55 +09:00
parent ca2370910c
commit badfb2f0a9
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Network/PacketDef/Ipcs.h
View file

@ -260,7 +260,7 @@ namespace Sapphire::Network::Packets
DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui DuelChallenge = 0x0277, // 4.2; this is responsible for opening the ui
PerformNote = 0x0286, // updated 4.3 PerformNote = 0x0286, // updated 4.3
PrepareZoning = 0x02A4, // updated 5.0 PrepareZoning = 0x035C, // updated 5.18
ActorGauge = 0x016D, // updated 5.18 ActorGauge = 0x016D, // updated 5.18
// daily quest info -> without them sent, login will take longer... // daily quest info -> without them sent, login will take longer...

3
src/scripts/common/aethernet/Aetheryte.cpp
View file

@ -59,7 +59,8 @@ public:
{ {
if( player.isAetheryteRegistered( eventId & 0xFFFF ) ) if( player.isAetheryteRegistered( eventId & 0xFFFF ) )
{ {
player.playScene( eventId, 0, 1, [this]( Entity::Player& player, const Event::SceneResult& result ) // eventParam4 (or params[1] if using EventPlay8, which is actually used on retail) anything bigger than 1 will show select instance menu item
player.playScene( eventId, 0, 1, 0, 1, 2, [this]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param1 == 256 ) // set homepoint if( result.param1 == 256 ) // set homepoint
{ {

2
src/world/Actor/Player.cpp
View file

@ -372,7 +372,7 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
// TODO: this should be simplified and a type created in server_common/common.h. // TODO: this should be simplified and a type created in server_common/common.h.
if( type == 1 ) // teleport if( type == 1 ) // teleport
{ {
prepareZoning( data->territory, true, 1, 112 ); // TODO: Really? prepareZoning( data->territory, true, 1, 0 ); // TODO: Really?
sendToInRangeSet( makeActorControl( getId(), ActorDespawnEffect, 0x04 ) ); sendToInRangeSet( makeActorControl( getId(), ActorDespawnEffect, 0x04 ) );
setZoningType( Common::ZoneingType::Teleport ); setZoningType( Common::ZoneingType::Teleport );
} }