diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/bepInEx/plugins/CWX-BushWhacker.dll b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/bepInEx/plugins/CWX-BushWhacker.dll new file mode 100644 index 0000000..4ca14c9 Binary files /dev/null and b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/bepInEx/plugins/CWX-BushWhacker.dll differ diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/LICENSE.txt b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/LICENSE.txt similarity index 92% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/LICENSE.txt rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/LICENSE.txt index cc68bd7..0e4432a 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/LICENSE.txt +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/LICENSE.txt @@ -4,8 +4,8 @@ Copyright (c) [year] [fullname]. All rights reserved. Developed by: [CWX] - [https://github.com/CWXDEV/CWX-DeSharpener] - [https://hub.sp-tarkov.com/files/file/455-cwx-desharpener/] + [https://dev.sp-tarkov.com/CWX/CWX-BushWhacker] + [https://hub.sp-tarkov.com/files/file/519-cwx-masterkey/] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.js b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.js similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.js rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.js diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.json b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.json similarity index 67% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.json rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.json index d1b8313..d31821c 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.json +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.json @@ -1,9 +1,9 @@ { "name": "BUSHWHACKER", "author": "CWX", - "version": "1.1.0", + "version": "1.0.1", "license": "NCSA", "main": "package.js", - "akiVersion": "3.0.0" + "akiVersion": "2.3.1" } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/bepInEx/plugins/CWX-BushWhacker.dll b/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/bepInEx/plugins/CWX-BushWhacker.dll deleted file mode 100644 index 6779567..0000000 Binary files a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/bepInEx/plugins/CWX-BushWhacker.dll and /dev/null differ diff --git a/Live/CWX_BushWhacker/Patch.cs b/Live/CWX_BushWhacker/Patch.cs index d9e2975..ed672e7 100644 --- a/Live/CWX_BushWhacker/Patch.cs +++ b/Live/CWX_BushWhacker/Patch.cs @@ -11,10 +11,10 @@ namespace BushWhacker { return typeof(GameWorld).GetMethod("OnGameStarted", BindingFlags.Public | BindingFlags.Instance); } + [PatchPostfix] public static void PatchPostFix() { - Debug.LogError("test patch"); BushWhacker.DisableBushes(); } } diff --git a/Live/CWX_BushWhacker/Plugin.cs b/Live/CWX_BushWhacker/Plugin.cs index 85c6d45..ef08829 100644 --- a/Live/CWX_BushWhacker/Plugin.cs +++ b/Live/CWX_BushWhacker/Plugin.cs @@ -17,13 +17,16 @@ namespace BushWhacker public static void DisableBushes() { - var gameWorld = Singleton.Instance; - var bushes = GameObject.FindObjectsOfType().ToList(); + var bushes = FindObjectsOfType().ToList(); + Debug.LogError(bushes.Count); foreach (var bushesItem in bushes) { - if (bushesItem.transform.parent.gameObject.name.Contains("filbert") || bushesItem.transform.parent.gameObject.name.Contains("fibert")) + Debug.LogError("1"); + var filbert = bushesItem?.transform?.parent?.gameObject?.name?.Contains("filbert"); + var fibert = bushesItem?.transform?.parent?.gameObject?.name?.Contains("fibert"); + if (filbert == true || fibert == true) { - Object.DestroyImmediate(bushesItem); + DestroyImmediate(bushesItem); } } }