From 3aa65a1ac90f80e113687180cef28eba17f0f0b8 Mon Sep 17 00:00:00 2001 From: Rushi <44952533+Skyliegirl33@users.noreply.github.com> Date: Mon, 21 Feb 2022 05:05:45 +0100 Subject: [PATCH 1/2] Sastasha: use int RNG (cherry picked from commit e44f2be26ab96ab866d35d4ed849564e23dfef6f) --- src/scripts/instances/dungeons/Sastasha.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/instances/dungeons/Sastasha.cpp b/src/scripts/instances/dungeons/Sastasha.cpp index 29155c56..71ce3b23 100644 --- a/src/scripts/instances/dungeons/Sastasha.cpp +++ b/src/scripts/instances/dungeons/Sastasha.cpp @@ -59,7 +59,7 @@ public: { // Random coral 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 ) ) { From 594cb7f11dd6c6f67c840416cec75311511a8bc2 Mon Sep 17 00:00:00 2001 From: Rushi <44952533+Skyliegirl33@users.noreply.github.com> Date: Mon, 21 Feb 2022 01:49:01 +0100 Subject: [PATCH 2/2] Fix unmounting (cherry picked from commit 5449d763cd93931b57f0c0cfdb37719d1bae7ddc) --- src/world/Manager/PlayerMgr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/world/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp index 5c988447..adfacbf4 100644 --- a/src/world/Manager/PlayerMgr.cpp +++ b/src/world/Manager/PlayerMgr.cpp @@ -185,10 +185,6 @@ void PlayerMgr::onMountUpdate( Entity::Player& player, uint32_t mountId ) player.sendToInRangeSet( makeActorControl( player.getId(), ActorControlType::SetStatus, static_cast< uint8_t >( Common::ActorStatus::Mounted ) ), true ); player.sendToInRangeSet( makeActorControlSelf( player.getId(), 0x39e, 12 ), true ); //? - - auto mountPacket = makeZonePacket< FFXIVIpcMount >( player.getId() ); - mountPacket->data().id = mountId; - player.sendToInRangeSet( mountPacket, true ); } else { @@ -196,6 +192,10 @@ void PlayerMgr::onMountUpdate( Entity::Player& player, uint32_t mountId ) static_cast< uint8_t >( Common::ActorStatus::Idle ) ), 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 )