From 9df7ce1f9a8ec478ed34efb3de96ddba1747c2e9 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 1 Nov 2018 09:27:38 +0100 Subject: [PATCH] - fixed: P_DamageMobj should clear reactiontime only for non-players. For players this variable has an entirely different meaning which does not agree with being modified here. --- src/p_interaction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index e1fea0c635..2d7d6026c5 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -1583,7 +1583,7 @@ dopain: } } //ALLOWPAIN and CAUSEPAIN can still trigger infighting, even if no pain state is worked out. - target->reactiontime = 0; // we're awake now... + if (target->player == nullptr) target->reactiontime = 0; // we're awake now... if (source) { if (source == target->target)