dave/Tarkov-UIFixes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix currentSelectGameObject null check (dont use ?.); block swapping components on an equipped gun with each other in raid

Browse Source
This commit is contained in:
Tyfon
2024-06-24 16:19:49 -07:00
parent 493dec9c3e
commit 34b1754ba2
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/ContextMenuShortcutPatches.cs
View File

@@ -29,7 +29,7 @@ namespace UIFixes
{ {
// Need an item context to operate on, and ignore these keypresses if there's a focused textbox somewhere // Need an item context to operate on, and ignore these keypresses if there's a focused textbox somewhere
ItemContextAbstractClass itemContext = __instance.R().ItemContext; ItemContextAbstractClass itemContext = __instance.R().ItemContext;
if (itemContext == null || EventSystem.current?.currentSelectedGameObject?.GetComponent<TMP_InputField>() != null) if (itemContext == null || EventSystem.current?.currentSelectedGameObject != null && EventSystem.current.currentSelectedGameObject.GetComponent<TMP_InputField>() != null)
{ {
return; return;
} }

12
Patches/SwapPatches.cs
View File

@@ -1,5 +1,6 @@
using Aki.Reflection.Patching; using Aki.Reflection.Patching;
using Aki.Reflection.Utils; using Aki.Reflection.Utils;
using EFT;
using EFT.InventoryLogic; using EFT.InventoryLogic;
using EFT.UI; using EFT.UI;
using EFT.UI.DragAndDrop; using EFT.UI.DragAndDrop;
@@ -381,6 +382,17 @@ namespace UIFixes
return; return;
} }
// Swapping items with each other when both are on an equipped gun in raid doesn't work
if (itemController is Player.PlayerInventoryController playerInventoryController)
{
Item item1 = __instance.Item.GetRootItem();
Item item2 = targetItemContext.Item.GetRootItem();
if (item1 == item2 && playerInventoryController.IsItemEquipped(item1))
{
return;
}
}
if (!ValidPrerequisites(__instance, targetItemContext, operation)) if (!ValidPrerequisites(__instance, targetItemContext, operation))
{ {
return; return;