Revert "alright im not so happy"

This reverts commit bd87832147.
This commit is contained in:
Milxnor
2023-05-12 17:51:29 -04:00
parent bd87832147
commit 9be64d79ca
21 changed files with 38 additions and 394 deletions

View File

@@ -433,12 +433,17 @@ void AFortPlayerController::ServerAttemptInteractHook(UObject* Context, FFrame*
if (auto BuildingContainer = Cast<ABuildingContainer>(ReceivingActor))
{
if (BuildingContainer->IsAlreadySearched())
static auto bAlreadySearchedOffset = BuildingContainer->GetOffset("bAlreadySearched");
static auto bAlreadySearchedFieldMask = GetFieldMask(BuildingContainer->GetProperty("bAlreadySearched"));
if (BuildingContainer->ReadBitfieldValue(bAlreadySearchedOffset, bAlreadySearchedFieldMask))
return;
BuildingContainer->SpawnLoot(PlayerController->GetMyFortPawn());
// LOG_INFO(LogInteraction, "bAlreadySearchedFieldMask: {}", bAlreadySearchedFieldMask);
BuildingContainer->SetAlreadySearched(true);
BuildingContainer->SetBitfieldValue(bAlreadySearchedOffset, bAlreadySearchedFieldMask, true);
BuildingContainer->SpawnLoot(PlayerController->GetMyFortPawn());
// if (BuildingContainer->ShouldDestroyOnSearch())
// BuildingContainer->K2_DestroyActor();
@@ -1469,7 +1474,6 @@ void AFortPlayerController::ClientOnPawnDiedHook(AFortPlayerController* PlayerCo
}
return ClientOnPawnDiedOriginal(PlayerController, DeathReport);
return ClientOnPawnDiedOriginal(PlayerController, DeathReport);
}
bool IsBuildingOkForEditing(ABuildingSMActor* BuildingActorToEdit)