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

Instance content debug command fix, instance cr now takes the contentfindercondition id

Browse source
This commit is contained in:
Mordred 2023-01-21 22:27:24 +01:00
parent f116878990
commit 6a7261a22b
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
deps/datReader/Exd/Structs.h vendored
View file

@ -207,7 +207,7 @@ namespace Excel
struct ContentFinderCondition struct ContentFinderCondition
{ {
uint16_t InstanceContentId; uint16_t InstanceContentId;
uint8_t ItemLevel; uint16_t ItemLevel;
uint8_t Unknown; uint8_t Unknown;
uint8_t RandomContentType; uint8_t RandomContentType;
uint8_t FinderPartyCondition; uint8_t FinderPartyCondition;
@ -242,6 +242,13 @@ namespace Excel
uint8_t Unknown20 : 1; uint8_t Unknown20 : 1;
uint8_t Unknown21 : 1; uint8_t Unknown21 : 1;
uint8_t Unknown22 : 1; uint8_t Unknown22 : 1;
uint8_t Unknown23;
uint8_t Unknown24;
uint8_t Unknown25;
uint8_t Unknown26;
uint8_t Unknown27;
uint8_t Unknown28;
}; };
@ -261,6 +268,8 @@ namespace Excel
uint8_t Unknown4 : 1; uint8_t Unknown4 : 1;
uint8_t Unknown5 : 1; uint8_t Unknown5 : 1;
uint8_t padding : 5; uint8_t padding : 5;
uint8_t Unknown6;
uint8_t Unknown7;
}; };
/* 63505 */ /* 63505 */

2
src/world/Manager/TerritoryMgr.cpp
View file

@ -363,7 +363,7 @@ TerritoryPtr TerritoryMgr::createInstanceContent( uint32_t contentFinderId )
auto pTeri = getTerritoryDetail( instanceContentData.TerritoryType ); auto pTeri = getTerritoryDetail( instanceContentData.TerritoryType );
auto name = pContentFinderCondition->getString( instanceContentData.Text.Name ); auto name = pInstanceContent->getString( instanceContentData.Text.Name );
if( !pTeri || name.empty() ) if( !pTeri || name.empty() )
return nullptr; return nullptr;