From a12b22975840929ab71e9e16c3992fa02c7629fd Mon Sep 17 00:00:00 2001 From: Anton Tarasenko Date: Thu, 23 Jun 2022 02:51:29 +0700 Subject: [PATCH] Change to account for AcediaCore refactor --- sources/FixAmmoSelling/AmmoPickupStalker.uc | 2 +- sources/FixInfiniteNades/FixedFragFire.uc | 2 +- sources/FixPipes/PipesSafetyCollision.uc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sources/FixAmmoSelling/AmmoPickupStalker.uc b/sources/FixAmmoSelling/AmmoPickupStalker.uc index d0dbc3a..4fe8183 100644 --- a/sources/FixAmmoSelling/AmmoPickupStalker.uc +++ b/sources/FixAmmoSelling/AmmoPickupStalker.uc @@ -58,7 +58,7 @@ event Touch(Actor other) if (!wasActive && !target.IsInState('Pickup')) return; ammoSellingFix = FixAmmoSelling_Feature( - class'FixAmmoSelling_Feature'.static.GetInstance()); + class'FixAmmoSelling_Feature'.static.GetEnabledInstance()); if (ammoSellingFix != none) { ammoSellingFix.RecordAmmoPickup(Pawn(other), target); } diff --git a/sources/FixInfiniteNades/FixedFragFire.uc b/sources/FixInfiniteNades/FixedFragFire.uc index fe7cba6..aaf4af2 100644 --- a/sources/FixInfiniteNades/FixedFragFire.uc +++ b/sources/FixInfiniteNades/FixedFragFire.uc @@ -25,7 +25,7 @@ function DoFireEffect() { local FixInfiniteNades_Feature nadeFix; nadeFix = FixInfiniteNades_Feature( - class'FixInfiniteNades_Feature'.static.GetInstance()); + class'FixInfiniteNades_Feature'.static.GetEnabledInstance()); if (nadeFix == none || nadeFix.RegisterNadeThrow(Frag(weapon))) { super.DoFireEffect(); } diff --git a/sources/FixPipes/PipesSafetyCollision.uc b/sources/FixPipes/PipesSafetyCollision.uc index 7f7f0d2..ea35662 100644 --- a/sources/FixPipes/PipesSafetyCollision.uc +++ b/sources/FixPipes/PipesSafetyCollision.uc @@ -85,7 +85,8 @@ function TakeDamage( local PipeBombProjectile target; target = PipeBombProjectile(owner); if (target == none) return; - pipesFix = FixPipes_Feature(class'FixPipes_Feature'.static.GetInstance()); + pipesFix = FixPipes_Feature( + class'FixPipes_Feature'.static.GetEnabledInstance()); if (pipesFix == none) return; if (pipesFix.preventMassiveDamage && target.bTriggered) return; if (pipesFix.preventSuspiciousDamage && IsSuspicious(instigator)) return;