From 496e452160fd52a2321911921c1f8e9e4e091741 Mon Sep 17 00:00:00 2001 From: Gray <84999745+Milxnor@users.noreply.github.com> Date: Fri, 15 Mar 2024 19:35:51 -0400 Subject: [PATCH] fix 3.2 --- Project Reboot 3.0/BuildingActor.h | 2 +- Project Reboot 3.0/FortGameModeAthena.cpp | 17 ++----------- Project Reboot 3.0/FortPlayerController.cpp | 28 +++------------------ Project Reboot 3.0/addresses.cpp | 2 +- Project Reboot 3.0/reboot.h | 4 +-- 5 files changed, 9 insertions(+), 44 deletions(-) diff --git a/Project Reboot 3.0/BuildingActor.h b/Project Reboot 3.0/BuildingActor.h index 5d72862..220d78f 100644 --- a/Project Reboot 3.0/BuildingActor.h +++ b/Project Reboot 3.0/BuildingActor.h @@ -18,7 +18,7 @@ public: UObject* ReplacedBuilding; // this also not on like below 18.00 } IBAParams{ BuildingOwner, Controller, bUsePlayerBuildAnimations, ReplacedBuilding }; - static auto fn = FindObject("/Script/FortniteGame.BuildingActor.InitializeKismetSpawnedBuildingActor"); + static auto fn = FindObject(L"/Script/FortniteGame.BuildingActor.InitializeKismetSpawnedBuildingActor"); this->ProcessEvent(fn, &IBAParams); } diff --git a/Project Reboot 3.0/FortGameModeAthena.cpp b/Project Reboot 3.0/FortGameModeAthena.cpp index 4eb735c..fb65e84 100644 --- a/Project Reboot 3.0/FortGameModeAthena.cpp +++ b/Project Reboot 3.0/FortGameModeAthena.cpp @@ -986,19 +986,6 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game LOG_INFO(LogDev, "bShouldUseReplicationGraph: {}", Globals::bShouldUseReplicationGraph); - if (Fortnite_Version >= 2.42 && Fortnite_Version < 3.4) - { - static auto FortHLODSMActorClass = FindObject("/Script/FortniteGame.FortHLODSMActor"); - auto FortHLODSMActors = UGameplayStatics::GetAllActorsOfClass(GetWorld(), FortHLODSMActorClass); - - for (int i = 0; i < FortHLODSMActors.Num(); ++i) - { - FortHLODSMActors.at(i)->K2_DestroyActor(); - } - - LOG_INFO(LogDev, "Destroyed HLODs!"); - } - Globals::bStartedListening = true; } @@ -1169,7 +1156,7 @@ int AFortGameModeAthena::Athena_PickTeamHook(AFortGameModeAthena* GameMode, uint } } - LOG_INFO(LogTeams, "Spreading Teams {} Player is going on team {}/{} with {} members.", bShouldSpreadTeams, NextTeamIndex, TeamsNum, CurrentTeamMembers); + LOG_INFO(LogTeams, "Spreading Teams {} Player is going on team {}/{} with {} members.", bShouldSpreadTeams, NextTeamIndex - 2, TeamsNum, CurrentTeamMembers); CurrentTeamMembers++; @@ -1239,7 +1226,7 @@ void AFortGameModeAthena::Athena_HandleStartingNewPlayerHook(AFortGameModeAthena static auto BGAClass = FindObject(L"/Script/Engine.BlueprintGeneratedClass"); UObject* OverrideBattleBusSkin = nullptr; - UClass* OverrideSupplyDropClass = LoadObject(L"/Game/Athena/SupplyDrops/AthenaSupplyDrop.AthenaSupplyDrop_C", BGAClass); + UClass* OverrideSupplyDropClass = LoadObject(L"/Game/Athena/SupplyDrops/AthenaSupplyDrop.AthenaSupplyDrop_C", BGAClass); // wrong for some builds but its ok if (Fortnite_Version == 1.11 || Fortnite_Version == 7.30 || Fortnite_Version == 11.31 || Fortnite_Version == 15.10 || Fortnite_Version == 19.10) { diff --git a/Project Reboot 3.0/FortPlayerController.cpp b/Project Reboot 3.0/FortPlayerController.cpp index 6151ac4..acb42a5 100644 --- a/Project Reboot 3.0/FortPlayerController.cpp +++ b/Project Reboot 3.0/FortPlayerController.cpp @@ -842,7 +842,7 @@ void AFortPlayerController::ServerCreateBuildingActorHook(UObject* Context, FFra if (!WorldInventory) return ServerCreateBuildingActorOriginal(Context, Stack, Ret); - auto PlayerStateAthena = Cast(PlayerController->GetPlayerState()); + auto PlayerStateAthena = Cast(PlayerController->GetPlayerState()); if (!PlayerStateAthena) return ServerCreateBuildingActorOriginal(Context, Stack, Ret); @@ -885,7 +885,7 @@ void AFortPlayerController::ServerCreateBuildingActorHook(UObject* Context, FFra if (!BuildingClass) return ServerCreateBuildingActorOriginal(Context, Stack, Ret); - auto GameState = Cast(Cast(GetWorld()->GetGameMode(), false)->GetGameState(), false); + auto GameState = Cast(Cast(GetWorld()->GetGameMode())->GetGameState()); auto StructuralSupportSystem = GameState->GetStructuralSupportSystem(); @@ -1707,11 +1707,7 @@ void AFortPlayerController::ServerBeginEditingBuildingActorHook(AFortPlayerContr AFortWeap_EditingTool* EditTool = nullptr; -#if 1 EditTool = Cast(Pawn->EquipWeaponDefinition(EditToolDef, EditToolInstance->GetItemEntry()->GetItemGuid())); -#else - EditTool = Cast(Pawn->GetCurrentWeapon()); -#endif if (!EditTool) return; @@ -1783,25 +1779,7 @@ void AFortPlayerController::ServerEndEditingBuildingActorHook(AFortPlayerControl if (!WorldInventory) return; - AFortWeap_EditingTool* EditTool = nullptr; - -#if 1 - auto EditToolInstance = WorldInventory->FindItemInstance(EditToolDef); - - if (!EditToolInstance) - return; - - FGuid EditToolGuid = EditToolInstance->GetItemEntry()->GetItemGuid(); // Should we ref? - -#if 0 - EditTool = Cast(Pawn->EquipWeaponDefinition(EditToolDef, EditToolGuid)); // ERM -#else - Cast(Pawn->EquipWeaponDefinition(EditToolDef, EditToolGuid)); // ERM - EditTool = Cast(Pawn->GetCurrentWeapon()); -#endif -#else - EditTool = Cast(Pawn->GetCurrentWeapon()); -#endif + AFortWeap_EditingTool* EditTool = Cast(Pawn->GetCurrentWeapon()); if (EditTool) { diff --git a/Project Reboot 3.0/addresses.cpp b/Project Reboot 3.0/addresses.cpp index 46ec684..20ef44d 100644 --- a/Project Reboot 3.0/addresses.cpp +++ b/Project Reboot 3.0/addresses.cpp @@ -478,7 +478,7 @@ void Offsets::FindAll() } if (Fortnite_Version == 3.2) { - Offsets::NetworkObjectList = 0x4F8; + Offsets::NetworkObjectList = 0x500; Offsets::ClientWorldPackageName = 0x1820; } if (Fortnite_Version == 3.2 || Fortnite_Version == 3.3) diff --git a/Project Reboot 3.0/reboot.h b/Project Reboot 3.0/reboot.h index 4409242..d7cbaf1 100644 --- a/Project Reboot 3.0/reboot.h +++ b/Project Reboot 3.0/reboot.h @@ -122,8 +122,8 @@ static inline UObject* GetLocalPlayerController() return LocalPlayer->Get(PlayerControllerOffset); } -template -static __forceinline T* Cast(UObject* Object, bool bCheckType = true) +template +static __forceinline T* Cast(UObject* Object) { if (bCheckType) {