From a87c249bc0d70da99f2652bbe01eca4c972a75ca Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 17 Aug 2022 19:03:19 +0200 Subject: [PATCH] Fix friendly fire blocking self-damage. --- language.version | 4 ++-- zscript/swwm_player_items.zsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 246e56344..284535e88 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r337 \cu(Wed 17 Aug 17:34:15 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r337 \cu(2022-08-17 17:34:15)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r338 \cu(Wed 17 Aug 19:03:19 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r338 \cu(2022-08-17 19:03:19)\c-"; diff --git a/zscript/swwm_player_items.zsc b/zscript/swwm_player_items.zsc index 903033276..95670303b 100644 --- a/zscript/swwm_player_items.zsc +++ b/zscript/swwm_player_items.zsc @@ -33,7 +33,7 @@ Class SayaCollar : SWWMArmor override void ModifyDamage( int damage, Name damageType, out int newdamage, bool passive, Actor inflictor, Actor source, int flags ) { int ff = swwm_friendlyfire; - if ( !source || !source.IsFriend(Owner) || !ff ) return; + if ( !source || (source == Owner) || !source.IsFriend(Owner) || !ff ) return; // 1: block incoming friendly damage // 2: also block outgoing friendly damage if ( (passive && ff) || (!passive && (ff == 2)) )