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

Fix weapon on back dupe

Browse Source
This commit is contained in:
AirwavesMan
2020-11-15 17:49:33 +01:00
parent ae52a0e5e8
commit 1697af9714
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/actions/pickupActions/object_pickup.sqf
View File

@@ -53,7 +53,7 @@ if (_classname isKindOf "Bag_Base_EP1") exitWith {
waitUntil { !isNull (unitBackpack player) };
uiSleep 0.03;
PVDZ_plr_Save = [player,nil,false];
PVDZ_plr_Save = [player,nil,dayz_onBack];
publicVariableServer "PVDZ_plr_Save";
};

2
SQF/dayz_code/actions/pzombie/pz_feed.sqf
View File

@@ -63,7 +63,7 @@ if !(alive _item) then {
dayz_lastMeal = time;
dayz_hunger = 0;
PVDZ_plr_Save = [player,nil,true];
PVDZ_plr_Save = [player,nil,dayz_onBack];
publicVariableServer "PVDZ_plr_Save";
[player,"eat",0,false] call dayz_zombieSpeak;

2
SQF/dayz_code/compile/player_forceSave.sqf
View File

@@ -7,7 +7,7 @@ Opens player inventory to save
_magazineArray = [] call player_countMagazines;
if ((count _magazineArray) > 0) then {
PVDZ_plr_Save = [player, if (player isKindOf "PZombie_VB") then {nil} else {[_magazineArray,dayz_onBack]}];
PVDZ_plr_Save = [player, if (player isKindOf "PZombie_VB") then {nil} else {_magazineArray},dayz_onBack];
publicVariableServer "PVDZ_plr_Save";
};

4
SQF/dayz_code/system/player_spawn_2.sqf
View File

@@ -240,7 +240,7 @@ while {1 == 1} do {
player setVariable ["USEC_lowBlood",true,true];
};
} else {
if (_lowBlood && {!r_player_injured}) then {
if (_lowBlood && !r_player_injured) then {
player setVariable ["USEC_lowBlood",false,true];
r_player_lowblood = false;
};
@@ -260,7 +260,7 @@ while {1 == 1} do {
if (dayz_unsaved || {(diag_ticktime - dayz_lastSave) > 300}) then {
if ((diag_ticktime - dayz_lastSave) > _saveTime) then {
PVDZ_plr_Save = [player,nil,false];
PVDZ_plr_Save = [player,nil,dayz_onBack];
publicVariableServer "PVDZ_plr_Save";
dayz_unsaved = false;
dayz_lastSave = diag_ticktime;

2
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -59,7 +59,7 @@ if (_characterID != "?") then {
//if player object is alive lets sync the player and remove the body and if ghosting is active add the player id to the array
if (alive _playerObj) then {
// High priority. Sync must finish fast before player object isNull
[_playerObj,nil,true,[],_inCombat] call server_playerSync;
[_playerObj,nil,"",[],_inCombat] call server_playerSync;
/*
Low priority code below this point where

7
SQF/dayz_server/compile/server_playerSync.sqf
View File

@@ -9,6 +9,7 @@ private ["_distanceFoot","_playerPos","_lastPos","_playerGear","_medical","_curr
_character = _this select 0;
_magazines = _this select 1;
local _dayz_onBack = _this select 2;
_characterID = _character getVariable ["characterID","0"];
_playerUID = getPlayerUID _character;
_charPos = getPosATL _character;
@@ -58,10 +59,8 @@ _killsB = _statsDiff select 4;
_charPosLen = count _charPos;
if (!isNil "_magazines") then {
if (typeName _magazines == "ARRAY") then {
_playerGear = [weapons _character,_magazines select 0,_magazines select 1];
_character setVariable["ServerMagArray",_magazines, false];
};
_playerGear = [weapons _character,_magazines,_dayz_onBack];
_character setVariable["ServerMagArray",[_magazines,_dayz_onBack], false];
} else {
//check Magazines everytime they aren't sent by player_forceSave
_magTemp = (_lastMagazines select 0);