Merge pull request #214 from Syphonfr/master

This commit is contained in:
Gray
2025-05-31 15:02:47 -04:00
committed by GitHub
2 changed files with 8 additions and 28 deletions

View File

@@ -51,27 +51,5 @@ void AFortPlayerPawnAthena::OnCapsuleBeginOverlapHook(UObject* Context, FFrame*
}
}
if (OtherActor && OtherActor->GetName().contains("Rift") && Fortnite_Version >= 17)
{
Pawn->TeleportTo(Pawn->GetActorLocation() + FVector(0, 0, 20000), Pawn->GetActorRotation());
UAbilitySystemComponent* AbilitySystemComponent = ((AFortPlayerStateAthena*)Pawn->GetPlayerState())->GetAbilitySystemComponent();
if (!AbilitySystemComponent) return;
UClass* RiftAbility = FindObject<UClass>(L"/Game/Athena/Items/ForagedItems/Rift/GA_Rift_Athena_Skydive.GA_Rift_Athena_Skydive_C");
if (!RiftAbility) return;
FGameplayAbilitySpec* Spec = MakeNewSpec(RiftAbility);
if (!Spec) return;
static unsigned int* (*GiveAbilityAndActivateOnce)(UAbilitySystemComponent * ASC, int* outHandle, __int64 Spec, FGameplayEventData * TriggerEventData) = decltype(GiveAbilityAndActivateOnce)(Addresses::GiveAbilityAndActivateOnce);
if (GiveAbilityAndActivateOnce)
{
int outHandle = 0;
GiveAbilityAndActivateOnce(AbilitySystemComponent, &outHandle, __int64(Spec), nullptr);
}
}
// return OnCapsuleBeginOverlapOriginal(Context, Stack, Ret); // we love explicit
}

View File

@@ -1045,14 +1045,16 @@ DWORD WINAPI Main(LPVOID)
}
}
if (Globals::bGoingToPlayEvent)
{
if (Fortnite_Version >= 17.30)
{
Hooking::MinHook::Hook(FindObject<UObject>("/Script/FortniteGame.Default__FortMissionLibrary"), FindObject<UFunction>(L"/Script/FortniteGame.FortMissionLibrary:TeleportPlayerPawn"), TeleportPlayerPawnHook,
(PVOID*)&TeleportPlayerPawnOriginal, false, true);
// Todo hook UBuffetRacePlayerMovementComponent::ServerTeleportPlayer?
}
if (Globals::bGoingToPlayEvent)
{
// Todo hook UBuffetRacePlayerMovementComponent::ServerTeleportPlayer?
if (Fortnite_Version == 17.50)
{
Hooking::MinHook::Hook(FindObject<UObject>("/Script/SpecialEventGameplayRuntime.Default__SpecialEventScript"), FindObject<UFunction>(L"/Script/SpecialEventGameplayRuntime.SpecialEventScript:StartEventAtIndex"), StartEventAtIndexHook,