From a9ddf898311f8849f123b8872d8d0fb09c85463c Mon Sep 17 00:00:00 2001
From: happydayz <happydayz.enigma@gmail.com>
Date: Tue, 26 Jul 2016 18:58:35 +1000
Subject: [PATCH] testing a few fixes

Attempt to prevent duping of player bodies, and if player isnt moved
into body after set amount of time they are kicked to new player screen.
---
 @Enigma/addons/enigma_exile_revive.pbo        | Bin 14932 -> 15249 bytes
 .../compile/Enigma/Exile_RevivePlayer.sqf     |  20 ++++++++-
 Exile.Altis/Custom/EnigmaRevive/init.sqf      |  39 +++++++++++-------
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/@Enigma/addons/enigma_exile_revive.pbo b/@Enigma/addons/enigma_exile_revive.pbo
index e1ac55262173526aaecad6dc4e64611e8a7b7270..df453cb079ae60ba66ba9e68c355c7234a8640c3 100644
GIT binary patch
delta 312
zcmcaoGO>I@Bj0)x1~7QHVS4y_la2iw^qD#13nmL1XfZ2ra&ERZFlMXg<>KV5wFZ(P
z0)%<F^z}<pi%S$r@)e3xQx!7P6iPBOixrAX@(YR;Qc4Rl^U^`8fLfws6^aWI%kva~
z>}rrfrJ2Dwsi_4DCO~t5HUPCMYGf7%<Rn(67AeFRfN4#jaj9S}oYe}v?m%6fDVd4s
z@j3bF3QDednd!NSL8)b#WvL3f3c>lgsX)u~(iO^6^GXyl@{5WxlX5B*%8T;z(iN4g
z6*xh*az+C^wbfK#9cWT&PHIVNSZYRQa!xADMxbMm{K(6-xzTJtv&h{G6Wnta_y#QU
Pe82EdR;cjJtG0&${dQkG

delta 81
zcmbPOex+nWBVUm*0~oZoRE8HBZ|vWozq!~zpG|}l2za?TIcu$fB!~dw$pKdCo1d9a
cXBOG<@}QaaV(T3rm%e(d@ldETt~d7*0Qk=wQUCw|

diff --git a/@Enigma/addons/enigma_exile_revive/compile/Enigma/Exile_RevivePlayer.sqf b/@Enigma/addons/enigma_exile_revive/compile/Enigma/Exile_RevivePlayer.sqf
index 7f59ee0..73d2b43 100644
--- a/@Enigma/addons/enigma_exile_revive/compile/Enigma/Exile_RevivePlayer.sqf
+++ b/@Enigma/addons/enigma_exile_revive/compile/Enigma/Exile_RevivePlayer.sqf
@@ -291,6 +291,7 @@ _extDB2Message call ExileServer_system_database_query_fireAndForget;
  	if (_reviveused > MaxRevivesAllowed) then 
  	{
  		_bambiPlayer setVariable ["REVIVE", false, true];
+ 		_player setVariable ["REVIVE", false, true]; 		
  	};
 
 	_msg = format ["%1 has been stabilised! You have been rewarded 100 Respect!",_name];
@@ -337,7 +338,22 @@ call ExileServer_system_network_send_to;
 	_ownerID publicVariableClient "EnigmaRevive";
 
 	_player allowDamage true;	
-				
+
 		};
 	};
-};
\ No newline at end of file
+};
+
+//test to see if this stops duping
+
+
+	[] spawn 
+	{
+		uiSleep 4;
+ 		if !(isPlayer _player) then 
+		{ 
+			diag_log "EnigmaRevive - Something went horribly wrong!"; 	
+			[_player] joinSilent ExileServerGraveyardGroup;
+			deleteVehicle _player;
+		};
+	};
+
diff --git a/Exile.Altis/Custom/EnigmaRevive/init.sqf b/Exile.Altis/Custom/EnigmaRevive/init.sqf
index 00d8f66..f545c64 100644
--- a/Exile.Altis/Custom/EnigmaRevive/init.sqf
+++ b/Exile.Altis/Custom/EnigmaRevive/init.sqf
@@ -67,18 +67,29 @@ player setVariable["antidupe", 1, true];
 	private["_newPlayerObject","_oldPlayerObject","_packet","_weapon","_reviver"];
 	 _packet = _this select 1;
 	_newPlayerObject = _packet select 0;
-	cutText ["","BLACK IN",20];
-	[100] call BIS_fnc_bloodEffect;
-	"Reviving player..." call ExileClient_util_log;
-	_layer = "BIS_fnc_respawnCounter" call bis_fnc_rscLayer;
-	_layer cutText ["", "plain"];
-	"Removing bleed out thread..." call ExileClient_util_log;
-	[ExileClientBleedOutThread] call ExileClient_system_thread_removeTask;
- 	ExileClientBleedOutThread = -1;
-	player setVariable ['EnigmaRevivePermitted', false, true];
-	false call ExileClient_gui_postProcessing_toggleDialogBackgroundBlur;
-	true call ExileClient_gui_hud_toggle;
-	player setVariable["antidupe", 1, true]; //remove the antidupe from the revived player!
+	if (alive _newPlayerObject) then
+	{	
+		cutText ["","BLACK IN",20];
+		[100] call BIS_fnc_bloodEffect;
+		"Reviving player..." call ExileClient_util_log;
+		_layer = "BIS_fnc_respawnCounter" call bis_fnc_rscLayer;
+		_layer cutText ["", "plain"];
+		"Removing bleed out thread..." call ExileClient_util_log;
+		[ExileClientBleedOutThread] call ExileClient_system_thread_removeTask;
+ 		ExileClientBleedOutThread = -1;
+		player setVariable ['EnigmaRevivePermitted', false, true];
+		false call ExileClient_gui_postProcessing_toggleDialogBackgroundBlur;
+		true call ExileClient_gui_hud_toggle;
+		["endBambiStateRequest"] call ExileClient_system_network_send;	//remove bambi status (changed in some previous version to clientside control)
+		[ExileClientEndBambiStateThread] call ExileClient_system_thread_removeTask;
+		ExileClientPlayerIsBambi = false;
+		false call ExileClient_gui_hud_toggleBambiIcon;	
+		player setVariable["antidupe", 1, true]; //remove the antidupe from the revived player!
+	}
+	else
+	{
+		call ExileClient_object_player_death_forceRespawn;
+	};
 };
 
 "EnigmaReviveFail" addPublicVariableEventHandler {
@@ -86,8 +97,8 @@ player setVariable["antidupe", 1, true];
   	_requestingPlayer = _packet select 0;
 	_revivername = _packet select 1;
   	systemChat Format ["%1 bungled your revive and killed you!",_revivername];
-  		player setVariable["antidupe", 1, true]; //remove the antidupe from the revived player!
-	[] call ExileClient_gui_escape_respawn; //force kill player
+  	player setVariable["antidupe", 1, true]; //remove the antidupe from the revived player!
+	call ExileClient_object_player_death_forceRespawn; //force kill player
 };
 
 "EnigmaReviveMSG" addPublicVariableEventHandler {