From b4434b1981860e9412fb25239d612960008bb81c Mon Sep 17 00:00:00 2001
From: Mittendrein Markus <maxmitti@gmx.net>
Date: Wed, 10 Feb 2016 14:22:21 +0100
Subject: Rework QueryCatchBlow

---
 TemplePushing.c4s/System.c4g/Clonk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'TemplePushing.c4s/System.c4g/Clonk.c')

diff --git a/TemplePushing.c4s/System.c4g/Clonk.c b/TemplePushing.c4s/System.c4g/Clonk.c
index 546f74c..09c4b20 100644
--- a/TemplePushing.c4s/System.c4g/Clonk.c
+++ b/TemplePushing.c4s/System.c4g/Clonk.c
@@ -84,7 +84,8 @@ protected func Death(int killedBy)
 
 public func QueryCatchBlow(object arrow)
 {
-	return arrow->GetOwner() == GetOwner();
+	if (arrow->~QueryOwnCatchBlow(this)) return 1;
+	return _inherited(arrow, ...);
 }
 
 private func FxCheckStuck2Timer(object pTarget, int iEffectNumber, int iEffectTime)
-- 
cgit v1.2.3-54-g00ecf