From 5935dc706ded00f027ce6608c787ade0ee2caa92 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 9 Apr 2017 00:06:23 +0200 Subject: [PATCH] - prevent infinite recursion in PlayerPawn.GetObituary when the inflictor is the same as the origin for the kill. --- wadsrc/static/zscript/shared/player.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/shared/player.txt b/wadsrc/static/zscript/shared/player.txt index 67414c542..20b2b320a 100644 --- a/wadsrc/static/zscript/shared/player.txt +++ b/wadsrc/static/zscript/shared/player.txt @@ -144,7 +144,7 @@ class PlayerPawn : Actor native if (mod == 'Telefrag') return "$OB_MPTELEFRAG"; String message; - if (inflictor != NULL) + if (inflictor != NULL && inflictor != self) { message = inflictor.GetObituary(victim, inflictor, mod, playerattack); }