escape original rumble methods

Ibodan · Dec 8, 2018 · 87304c6 · 87304c6
1 parent 439a8e7
commit 87304c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/RumbleEnhancerOculus/HarmonyPatches.cs b/RumbleEnhancerOculus/HarmonyPatches.cs
@@ -55,6 +55,20 @@ static void Prefix(XRNode node)
 				PersistentSingleton<MyHapticFeedbackController>.instance.ContinuousRumble(node, Plugin.ObstacleClip);
 			}
 		}
+		static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+		{
+			return new List<CodeInstruction>() { new CodeInstruction(OpCodes.Ret) };
+		}
+	}
+
+	[HarmonyPatch(typeof(HapticFeedbackController))]
+	[HarmonyPatch("Rumble")]
+	public static class HapticFeedbackControllerRumblePatch
+	{
+		static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+		{
+			return new List<CodeInstruction>() { new CodeInstruction(OpCodes.Ret) };
+		}
 	}
 
 	[HarmonyPatch(typeof(OculusVRHelper))]
@@ -72,9 +86,7 @@ static void Prefix(XRNode node, float strength)
 		}
 		static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
 		{
-			var codes = new List<CodeInstruction>(instructions);
-			codes[0].opcode = OpCodes.Ret;
-			return codes.AsEnumerable();
+			return new List<CodeInstruction>() { new CodeInstruction(OpCodes.Ret) };
 		}
 	}
 }
diff --git a/RumbleEnhancerOculus/Plugin.cs b/RumbleEnhancerOculus/Plugin.cs
@@ -16,7 +16,7 @@ public class Plugin : IPlugin
 		public static float CutRumbleDuration;
 
 		public string Name => "RumbleEnhancerOculus";
-		public string Version => "1.0.0";
+		public string Version => "1.0.2";
 
 		private OVRHapticsClip createHapticsClip(string strPattern)
 		{