mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 16:17:46 +00:00
Code Activity

Merge pull request #961 from collett8192/retail

Browse source 
fix InitZone and enable flying
This commit is contained in:
Mordred 2024-06-26 13:32:15 +02:00 • committed by GitHub
commit 907e625ffe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -931,14 +931,14 @@ namespace Sapphire::Network::Packets::Server
uint32_t unknown8; uint32_t unknown8;
uint16_t festivalId; uint16_t festivalId;
uint16_t additionalFestivalId; uint16_t additionalFestivalId;
uint32_t unknown9; uint32_t unknown9[2];
uint32_t unknown10; uint32_t unknown10;
uint32_t unknown11; uint32_t unknown11;
uint32_t unknown12[4]; uint32_t unknown12[4];
uint32_t unknown13[3]; uint32_t unknown13[3];
Common::FFXIVARR_POSITION3 pos; Common::FFXIVARR_POSITION3 pos;
uint32_t unknown14[3]; uint32_t unknown14[3];
uint32_t unknown15; uint32_t unknown15[2];
}; };
@ -2270,8 +2270,8 @@ namespace Sapphire::Network::Packets::Server
uint16_t guardianDeity; uint16_t guardianDeity;
uint32_t u5; uint32_t u5;
uint32_t models[10]; uint32_t models[10];
uint8_t unknown[10];
uint8_t look[26]; uint8_t look[26];
uint16_t padding3;
} actors[2]; } actors[2];
}; };

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

@ -1936,7 +1936,7 @@ void Sapphire::Entity::Player::sendZonePackets()
auto initZonePacket = makeZonePacket< FFXIVIpcInitZone >( getId() ); auto initZonePacket = makeZonePacket< FFXIVIpcInitZone >( getId() );
initZonePacket->data().zoneId = getCurrentTerritory()->getTerritoryTypeId(); initZonePacket->data().zoneId = getCurrentTerritory()->getTerritoryTypeId();
initZonePacket->data().weatherId = static_cast< uint8_t >( getCurrentTerritory()->getCurrentWeather() ); initZonePacket->data().weatherId = static_cast< uint8_t >( getCurrentTerritory()->getCurrentWeather() );
initZonePacket->data().bitmask = 0x1; initZonePacket->data().bitmask1 = 0x10;
initZonePacket->data().festivalId = getCurrentTerritory()->getCurrentFestival().first; initZonePacket->data().festivalId = getCurrentTerritory()->getCurrentFestival().first;
initZonePacket->data().additionalFestivalId = getCurrentTerritory()->getCurrentFestival().second; initZonePacket->data().additionalFestivalId = getCurrentTerritory()->getCurrentFestival().second;
initZonePacket->data().pos.x = getPos().x; initZonePacket->data().pos.x = getPos().x;
@ -1945,7 +1945,6 @@ void Sapphire::Entity::Player::sendZonePackets()
if( auto d = getCurrentTerritory()->getAsDirector() ) if( auto d = getCurrentTerritory()->getAsDirector() )
{ {
initZonePacket->data().contentfinderConditionId = d->getContentFinderConditionId(); initZonePacket->data().contentfinderConditionId = d->getContentFinderConditionId();
initZonePacket->data().bitmask = 0xFF;
initZonePacket->data().bitmask1 = 0x2A; initZonePacket->data().bitmask1 = 0x2A;
} }
queuePacket( initZonePacket ); queuePacket( initZonePacket );

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

@ -154,7 +154,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
} }
case ClientTriggerType::Examine: case ClientTriggerType::Examine:
{ {
uint32_t targetId = p1u64; uint32_t targetId = p1;
examineHandler( player, targetId ); examineHandler( player, targetId );
break; break;
} }