Fix recieving awards after ejected from bike and riding again

kagikn · Aug 18, 2017 · 98b5fd5 · 98b5fd5
1 parent 95c7bc6
commit 98b5fd5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/StuntBonusV/StuntBonusMonitor/SkiingBonus.cs b/StuntBonusV/StuntBonusMonitor/SkiingBonus.cs
@@ -59,19 +59,19 @@ internal void OnTick(object o, EventArgs e)
                 if (!player.SafeExists()) { return; }
                 var playerVeh = Game.Player.Character.CurrentVehicle;
 
-                if (playerVeh.SafeExists() && _currentVehicle != playerVeh)
+                if (playerVeh.SafeExists() && (!_currentVehicle.SafeExists() || _currentVehicle != playerVeh))
                 {
                     _currentVehicle = playerVeh;
                     _isPerformingSkiing = false;
                 }
-                else if (!_currentVehicle.SafeExists())
+                else if (!_currentVehicle.SafeExists() || !player.IsInVehicle(_currentVehicle))
                 {
                     _currentVehicle = null;
                     _isPerformingSkiing = false;
                     return;
                 }
 
-                if (_currentVehicle.SafeExists() && player.IsInVehicle(_currentVehicle))
+                if (_currentVehicle.SafeExists())
                 {
                     if (_currentVehicle.IsAlive && _currentVehicle.IsInSkiingStunt())
                     {

diff --git a/StuntBonusV/StuntBonusMonitor/StoppieBonus.cs b/StuntBonusV/StuntBonusMonitor/StoppieBonus.cs
@@ -59,19 +59,19 @@ internal void OnTick(object o, EventArgs e)
                 if (!player.SafeExists()) { return; }
                 var playerVeh = Game.Player.Character.CurrentVehicle;
 
-                if (playerVeh.SafeExists() && _currentVehicle != playerVeh)
+                if (playerVeh.SafeExists() && (!_currentVehicle.SafeExists() || _currentVehicle != playerVeh))
                 {
                     _currentVehicle = playerVeh;
                     _isPerformingStoppie = false;
                 }
-                else if (!_currentVehicle.SafeExists())
+                else if (!_currentVehicle.SafeExists() || !player.IsInVehicle(_currentVehicle))
                 {
                     _currentVehicle = null;
                     _isPerformingStoppie = false;
                     return;
                 }
 
-                if (_currentVehicle.SafeExists() && player.IsInVehicle(_currentVehicle))
+                if (_currentVehicle.SafeExists())
                 {
                     if (_currentVehicle.IsAlive && _currentVehicle.IsInStoppie())
                     {

diff --git a/StuntBonusV/StuntBonusMonitor/WheelieBonus.cs b/StuntBonusV/StuntBonusMonitor/WheelieBonus.cs
@@ -60,19 +60,19 @@ internal void OnTick(object o, EventArgs e)
                 if (!player.SafeExists()) { return; }
                 var playerVeh = Game.Player.Character.CurrentVehicle;
 
-                if (playerVeh.SafeExists() && _currentVehicle != playerVeh)
+                if (playerVeh.SafeExists() && (!_currentVehicle.SafeExists() || _currentVehicle != playerVeh))
                 {
                     _currentVehicle = playerVeh;
                     _isPerformingWheelie = false;
                 }
-                else if (!_currentVehicle.SafeExists())
+                else if (!_currentVehicle.SafeExists() || !player.IsInVehicle(_currentVehicle))
                 {
                     _currentVehicle = null;
                     _isPerformingWheelie = false;
                     return;
                 }
 
-                if (_currentVehicle.SafeExists() && player.IsInVehicle(_currentVehicle))
+                if (_currentVehicle.SafeExists())
                 {
                     if (_currentVehicle.IsAlive && _currentVehicle.IsInWheelie())
                     {

diff --git a/StuntBonusV/StuntBonusV.csproj b/StuntBonusV/StuntBonusV.csproj
@@ -51,6 +51,9 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ScriptHookVDotNet2">
       <HintPath>.\ScriptHookVDotNet2.dll</HintPath>