ACE3 medical update fix

musurca · Jan 11, 2020 · ed0d9cd · ed0d9cd
1 parent 06127fb
commit ed0d9cd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -93,6 +93,9 @@ For questions, comments, or bug reports, please contact me directly at nick.musu
 CHANGELOG:
 ---------------------
 
+v1.31 (January 11, 2020):
+* bugfix: two events created on civilian death (related to ACE3 Medical update)
+
 v1.3 (May 25, 2019):
 * added: Autopsies
 * added: autopsy event handler if concealed death is revealed

diff --git a/addons/GR/functions/fn_onLocalCivKilled.sqf b/addons/GR/functions/fn_onLocalCivKilled.sqf
@@ -9,6 +9,10 @@
 
 params ["_killed", ["_killer", objNull]];
 
+//Workaround for ACE3 Medical bug in which "killed" EH is called twice
+if (_killed getVariable ["GR_WASKILLED",0] == 1) exitWith {};
+_killed setVariable ["GR_WASKILLED",1];
+
 if(side (group _killed) == civilian) then {
 	// Workaround for ACE medical	
 	if ((isNull _killer) || {_killer == _killed}) then {

diff --git a/addons/GR/functions/fn_onUnitKilled.sqf b/addons/GR/functions/fn_onUnitKilled.sqf
@@ -11,6 +11,10 @@ if (!isServer) exitWith {};
 
 params ["_killed", ["_killer", objNull]];
 
+//Workaround for ACE3 Medical bug in which "killed" EH is called twice
+if (_killed getVariable ["GR_WASKILLED",0] == 1) exitWith {};
+_killed setVariable ["GR_WASKILLED",1];
+
 if ((isNull _killer) || {_killer == _killed}) then {
 	_killer = _killed getVariable ["ace_medical_lastDamageSource", objNull];
 };

diff --git a/mod.cpp b/mod.cpp
@@ -12,4 +12,4 @@ overview = "Civilian deaths, reparations, and war crimes. Deliver the bodies of
 author = "@musurca";
 overviewText = "GR";
 overviewPicture = "img\logomain.paa";
-overviewFootnote = "v130";
+overviewFootnote = "v131";