From aa246bf67bc9523239efbb3bfc1960b28f335a44 Mon Sep 17 00:00:00 2001
From: Wultir <62209995+wultir@users.noreply.github.com>
Date: Mon, 7 Dec 2020 17:40:33 +0100
Subject: [PATCH] Self-shock fix.

Call ChatRoomPublishCustomAction() without LeaveDialog in InventoryItemNeckAccessoriesCollarShockUnitTrigger() and call DialogLeave() later sice otherwise DialogFocusItem is cleared and it is used when updating the player's arousal.
---
 .../ItemNeckAccessories/CollarShockUnit/CollarShockUnit.js     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BondageClub/Screens/Inventory/ItemNeckAccessories/CollarShockUnit/CollarShockUnit.js b/BondageClub/Screens/Inventory/ItemNeckAccessories/CollarShockUnit/CollarShockUnit.js
index f91d99eb87..25e375999c 100644
--- a/BondageClub/Screens/Inventory/ItemNeckAccessories/CollarShockUnit/CollarShockUnit.js
+++ b/BondageClub/Screens/Inventory/ItemNeckAccessories/CollarShockUnit/CollarShockUnit.js
@@ -75,12 +75,13 @@ function InventoryItemNeckAccessoriesCollarShockUnitTrigger() {
 	Dictionary.push({ AssetName: DialogFocusItem.Asset.Name });
 	Dictionary.push({ AssetGroupName: DialogFocusItem.Asset.Group.Name });
 		
-	ChatRoomPublishCustomAction("TriggerShock" + DialogFocusItem.Property.Intensity, true, Dictionary);
+	ChatRoomPublishCustomAction("TriggerShock" + DialogFocusItem.Property.Intensity, false, Dictionary);
 		
 	if (C.ID == Player.ID) {
 		// The Player shocks herself
 		ActivityArousalItem(C, C, DialogFocusItem.Asset);
 	}
+	if (CurrentScreen == "ChatRoom") DialogLeave();
 	
     CharacterSetFacialExpression(C, "Eyebrows", "Soft", 10);
     CharacterSetFacialExpression(C, "Blush", "Soft", 15);
-- 
GitLab