From c005e466e7d83fd07f87d67d495c2efd3c2e3852 Mon Sep 17 00:00:00 2001 From: Roel Date: Sun, 17 Feb 2019 12:27:21 +0100 Subject: [PATCH] fixed social fight issue --- Assemblies/DualWield.dll | Bin 75264 -> 75264 bytes Source/DualWield/Harmony/Pawn_MeleeVerbs.cs | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/Assemblies/DualWield.dll b/Assemblies/DualWield.dll index 3fde6adc7a509bc439ba6115fc00b7edf90432cd..4dfa9500d1075f34bdd49d5ca26ff8caf1b34823 100644 GIT binary patch delta 5886 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 U_@w)?Y17Dqu0*L-D#^6{H^rWd?EnA( delta 5924 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 diff --git a/Source/DualWield/Harmony/Pawn_MeleeVerbs.cs b/Source/DualWield/Harmony/Pawn_MeleeVerbs.cs index 2cbb6b7..87ac354 100644 --- a/Source/DualWield/Harmony/Pawn_MeleeVerbs.cs +++ b/Source/DualWield/Harmony/Pawn_MeleeVerbs.cs @@ -48,6 +48,10 @@ static void Postfix(Pawn_MeleeVerbs __instance, Thing target, Verb verbToUse, bo { return; } + if (pawn.InMentalState) + { + return; + } Verb verb = __instance.Pawn.TryGetMeleeVerbOffHand(target); if(verb != null)