shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

infinite loop protection

Browse Source
This commit is contained in:
kevinz000
2020-05-30 01:00:41 -07:00
parent 05fe0c7dcc
commit 6b0b20b171
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_active_parry.dm
+1 -1
View File
@@ -206,7 +206,7 @@
to_chat(src, "<span class='warning'>Your parry is interrupted!</span>")
end_parry_sequence()
var/datum/block_parry_data/data = get_parry_data()
if(attack_type && !(attack_type & data.parry_attack_types))
if(attack_type && (!(attack_type & data.parry_attack_types) || (attack_type & ATTACK_TYPE_PARRY_COUNTERATTACK))) // if this attack is from a parry do not parry it lest we infinite loop.
return BLOCK_NONE
var/efficiency = get_parry_efficiency(attack_type)
switch(parrying)