W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 20:13:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix potential kills doubling after change clothes

Browse Source 
Fix by @seelenapparat
This commit is contained in:
AirwavesMan
2020-09-13 15:18:17 +02:00
parent e93783d190
commit 0b26ae1246
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SQF/dayz_code/compile/player_humanityMorph.sqf
View File

@@ -37,7 +37,7 @@ if (Z_SingleCurrency) then {
}; };
//Switch //Switch
[_model, _charID, _humanity] call player_switchModel; //Already spawned thread, no need to spawn and waitUntil script is done [_model, _charID, _humanity, _zombieKills, _headShots, _humanKills, _banditKills] call player_switchModel; //Already spawned thread, no need to spawn and waitUntil script is done
//Login //Login
@@ -81,10 +81,10 @@ if (count _medical > 0) then {
//General Stats //General Stats
//player setVariable ["humanity",_humanity,true]; //Moved to player_switchModel //player setVariable ["humanity",_humanity,true]; //Moved to player_switchModel
player setVariable ["zombieKills",_zombieKills,true]; //player setVariable ["zombieKills",_zombieKills,true]; //Moved to player_switchModel
player setVariable ["headShots",_headShots,true]; //player setVariable ["headShots",_headShots,true]; //Moved to player_switchModel
player setVariable ["humanKills",_humanKills,true]; //player setVariable ["humanKills",_humanKills,true]; //Moved to player_switchModel
player setVariable ["banditKills",_banditKills,true]; //player setVariable ["banditKills",_banditKills,true]; //Moved to player_switchModel
//player setVariable ["characterID",_charID,true]; //Moved to player_switchModel //player setVariable ["characterID",_charID,true]; //Moved to player_switchModel
player setVariable ["worldspace",_worldspace]; player setVariable ["worldspace",_worldspace];
player setVariable ["combattimeout",_combattimeout,false]; player setVariable ["combattimeout",_combattimeout,false];

4
SQF/dayz_code/compile/player_switchModel.sqf
View File

@@ -75,6 +75,10 @@ if (_isArray) then {
mydamage_eh1 = _newUnit AddEventHandler ["HandleDamage", {False}]; mydamage_eh1 = _newUnit AddEventHandler ["HandleDamage", {False}];
_newUnit setVariable ["characterID",(_this select 1),true]; _newUnit setVariable ["characterID",(_this select 1),true];
_newUnit setVariable ["humanity",(_this select 2),true]; _newUnit setVariable ["humanity",(_this select 2),true];
_newUnit setVariable ["zombieKills",(_this select 3),true];
_newUnit setVariable ["headShots",(_this select 4),true];
_newUnit setVariable ["humanKills",(_this select 5),true];
_newUnit setVariable ["banditKills",(_this select 6),true];
}; };
_newUnit setDir _dir; _newUnit setDir _dir;
{_newUnit removeMagazine _x;} count magazines _newUnit; {_newUnit removeMagazine _x;} count magazines _newUnit;