fix bugs with picking up + lategame loot

This commit is contained in:
Milxnor
2023-04-20 19:36:49 -04:00
parent 0ed3615415
commit 5b930c7328
9 changed files with 58 additions and 25 deletions

View File

@@ -4,8 +4,10 @@
void AFortPlayerStateAthena::ServerSetInAircraftHook(UObject* Context, FFrame& Stack, void* Ret)
{
/* LOG_INFO(LogDev, "bLateGame: {}", Globals::bLateGame)
if (Globals::bLateGame)
return ServerSetInAircraftOriginal(Context, Stack, Ret);
return ServerSetInAircraftOriginal(Context, Stack, Ret); */
auto PlayerState = (AFortPlayerStateAthena*)Context;
auto PlayerController = Cast<AFortPlayerControllerAthena>(PlayerState->GetOwner());
@@ -24,7 +26,7 @@ void AFortPlayerStateAthena::ServerSetInAircraftHook(UObject* Context, FFrame& S
auto& ItemInstances = InventoryList.GetItemInstances();
if (/* (bNewInAircraft && !PlayerController->IsInAircraft()) || */ /* (Globals::bLateGame ? bNewInAircraft : true)) && */ ItemInstances.Num())
if (/* (bNewInAircraft && !PlayerController->IsInAircraft()) || */ /* (Globals::bLateGame ? bNewInAircraft : true)) && */ !Globals::bLateGame && ItemInstances.Num())
{
// std::cout << "InventoryList.ItemInstances.Num(): " << InventoryList.ItemInstances.Num() << '\n';