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

fix performing

Browse source
This commit is contained in:
collett 2021-02-25 21:25:40 +09:00
parent 9e87d8b43f
commit 8c2f23e71d
5 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/Common.h
View file

@ -757,6 +757,7 @@ namespace Sapphire::Common
BetweenAreas = 24, BetweenAreas = 24,
BoundByDuty = 28, BoundByDuty = 28,
Performing = 40,
WatchingCutscene = 50, // this is actually just a dummy, this id is different WatchingCutscene = 50, // this is actually just a dummy, this id is different

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

@ -277,7 +277,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 = 0x0248, // updated 5.45 hotfixs
PrepareZoning = 0x01EE, // updated 5.45 hotfix PrepareZoning = 0x01EE, // updated 5.45 hotfix
ActorGauge = 0x018E, // updated 5.45 hotfix ActorGauge = 0x018E, // updated 5.45 hotfix
@ -415,7 +415,7 @@ namespace Sapphire::Network::Packets
UpdatePositionInstance = 0x034E, // updated 5.45 hotfix UpdatePositionInstance = 0x034E, // updated 5.45 hotfix
PerformNoteHandler = 0x029B, // updated 4.3 PerformNoteHandler = 0x0336, // updated 5.45 hotfix
WorldInteractionHandler = 0x02E4, // updated 5.45 hotfix WorldInteractionHandler = 0x02E4, // updated 5.45 hotfix
Dive = 0x00F1, // updated 5.45 hotfix Dive = 0x00F1, // updated 5.45 hotfix

2
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -1851,7 +1851,7 @@ namespace Sapphire::Network::Packets::Server
struct FFXIVIpcPerformNote : FFXIVIpcBasePacket< PerformNote > struct FFXIVIpcPerformNote : FFXIVIpcBasePacket< PerformNote >
{ {
uint8_t data[32]; uint8_t data[16];
}; };
struct FFXIVIpcHousingUpdateLandFlagsSlot : FFXIVIpcBasePacket< HousingUpdateLandFlagsSlot > struct FFXIVIpcHousingUpdateLandFlagsSlot : FFXIVIpcBasePacket< HousingUpdateLandFlagsSlot >

16
src/world/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -496,6 +496,22 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
player.sendDebug( "event battle p1: {0}, p11: {1}, p12: {2}, p2: {3}, p3: {4}, p4: {5}, p5: {6}", param1, param11, param12, param2, param3, param4, param5 ); player.sendDebug( "event battle p1: {0}, p11: {1}, p12: {2}, p2: {3}, p3: {4}, p4: {5}, p5: {6}", param1, param11, param12, param2, param3, param4, param5 );
break; break;
} }
case ClientTriggerType::OpenPerformInstrumentUI:
{
//param11 = instrument, 0 = end
player.sendDebug( "perform: {}", param11 );
if( param11 == 0 )
{
player.sendToInRangeSet( makeActorControl( player.getId(), ActorControl::SetStatus, 1, 0, 0, 0 ), true );
player.unsetStateFlag( PlayerStateFlag::Performing );
}
else
{
player.sendToInRangeSet( makeActorControl( player.getId(), ActorControl::SetStatus, 16, param11, 0, 0 ), true );
player.setStateFlag( PlayerStateFlag::Performing );
}
break;
}
case ClientTriggerType::CameraMode: case ClientTriggerType::CameraMode:
{ {
if( param11 == 1 ) if( param11 == 1 )

2
src/world/Network/Handlers/PacketHandlers.cpp
View file

@ -645,7 +645,7 @@ void Sapphire::Network::GameConnection::performNoteHandler( const Packets::FFXIV
Entity::Player& player ) Entity::Player& player )
{ {
auto performPacket = makeZonePacket< FFXIVIpcPerformNote >( player.getId() ); auto performPacket = makeZonePacket< FFXIVIpcPerformNote >( player.getId() );
memcpy( &performPacket->data().data[ 0 ], &inPacket.data[ 0x10 ], 32 ); memcpy( &performPacket->data().data[ 0 ], &inPacket.data[ 0x10 ], 16 );
player.sendToInRangeSet( performPacket ); player.sendToInRangeSet( performPacket );
} }