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

Merge pull request #804 from Skyliegirl33/feature-impl

Browse source 
[3.x] Use integral RNG in Sastasha and fix unmounting
This commit is contained in:
Mordred 2022-02-24 22:47:22 +01:00 • committed by GitHub
commit b0e0f6db0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/instances/dungeons/Sastasha.cpp
View file

@ -59,7 +59,7 @@ public:
{ {
// Random coral // Random coral
auto& RNGMgr = Common::Service< World::Manager::RNGMgr >::ref(); auto& RNGMgr = Common::Service< World::Manager::RNGMgr >::ref();
instance.setCustomVar( Coral, static_cast< uint64_t >( RNGMgr.getRandGenerator< float >( Corals::Blue, Corals::Green ).next() ) ); instance.setCustomVar( Coral, RNGMgr.getRandGenerator< uint32_t >( Corals::Blue, Corals::Green ).next() );
switch( instance.getCustomVar( Coral ) ) switch( instance.getCustomVar( Coral ) )
{ {

8
src/world/Manager/PlayerMgr.cpp
View file

@ -185,10 +185,6 @@ void PlayerMgr::onMountUpdate( Entity::Player& player, uint32_t mountId )
player.sendToInRangeSet( makeActorControl( player.getId(), ActorControlType::SetStatus, player.sendToInRangeSet( makeActorControl( player.getId(), ActorControlType::SetStatus,
static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true ); static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true );
player.sendToInRangeSet( makeActorControlSelf( player.getId(), 0x39e, 12 ), true ); //? player.sendToInRangeSet( makeActorControlSelf( player.getId(), 0x39e, 12 ), true ); //?
auto mountPacket = makeZonePacket< FFXIVIpcMount >( player.getId() );
mountPacket->data().id = mountId;
player.sendToInRangeSet( mountPacket, true );
} }
else else
{ {
@ -196,6 +192,10 @@ void PlayerMgr::onMountUpdate( Entity::Player& player, uint32_t mountId )
static_cast< uint8_t >( Common::ActorStatus::Idle ) ), true ); static_cast< uint8_t >( Common::ActorStatus::Idle ) ), true );
player.sendToInRangeSet( makeActorControlSelf( player.getId(), ActorControlType::Dismount, 1 ), true ); player.sendToInRangeSet( makeActorControlSelf( player.getId(), ActorControlType::Dismount, 1 ), true );
} }
auto mountPacket = makeZonePacket< FFXIVIpcMount >( player.getId() );
mountPacket->data().id = mountId;
player.sendToInRangeSet( mountPacket, true );
} }
void PlayerMgr::onMobKill( Entity::Player& player, Entity::BNpc& bnpc ) void PlayerMgr::onMobKill( Entity::Player& player, Entity::BNpc& bnpc )