diff --git a/CHANGE LOG 1.0.6.2.txt b/CHANGE LOG 1.0.6.2.txt index 90fc028e6..3d14b4d25 100644 --- a/CHANGE LOG 1.0.6.2.txt +++ b/CHANGE LOG 1.0.6.2.txt @@ -33,6 +33,7 @@ [FIXED] Multiple players can no longer harvest the same plant at once. #1928 @F507DMT [FIXED] Purchased boats sometimes not spawning on helipad even when it is free of obstructions. [FIXED] Unable to fill water at some ponds and wells on Napf and Namalsk due to missing or misplaced waterHoleProxy. +[FIXED] Potential undefined error for dayz_characterID on login. @oiad [NOTE] Fixes below are included in the mission file and server pbo as part of server package 1.0.6.1A (March 10th 2017) [FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions. diff --git a/SQF/dayz_code/compile/fn_check_access.sqf b/SQF/dayz_code/compile/fn_check_access.sqf index c91087afa..267e96d65 100644 --- a/SQF/dayz_code/compile/fn_check_access.sqf +++ b/SQF/dayz_code/compile/fn_check_access.sqf @@ -69,7 +69,7 @@ _targetType = if(typeOf _target in DZE_DoorsLocked) then { "DOOR"; } else { "GEN // determine owner and player id // and check if player is owner of target object _playerUID = getPlayerUID _player; -_characterID = dayz_characterID; +_characterID = player getVariable ["CharacterID","0"]; if (DZE_permanentPlot) then { _targetOwnerUID = if (isPlayer _target) then { getPlayerUID _target } else { _target getVariable ["ownerPUID","0"] }; _isOwner = (_playerUID == _targetOwnerUID); diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 7a3c3cbbb..ac76f3255 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -13,7 +13,7 @@ private ["_canPickLight","_text","_unlock","_lock","_totalKeys","_temp_keys","_t "_isModular","_isModularDoor","_isHouse","_isGate","_isFence","_isLockableGate","_isUnlocked","_isOpen","_isClosed","_ownerArray","_ownerBuildLock", "_ownerPID","_speed","_dog","_vehicle","_inVehicle","_cursorTarget","_primaryWeapon","_currentWeapon","_magazinesPlayer","_onLadder","_canDo", "_nearLight","_vehicleOwnerID","_hasHotwireKit","_isPZombie","_dogHandle","_allowedDistance","_id","_upgrade","_weaponsPlayer","_hasCrowbar", -"_allowed","_hasAccess","_uid"]; +"_allowed","_hasAccess","_uid","_myCharID"]; _vehicle = vehicle player; _inVehicle = (_vehicle != player); @@ -27,6 +27,7 @@ _canDo = (!r_drag_sqf && !r_player_unconscious && !_onLadder); _uid = getPlayerUID player; _nearLight = nearestObject [player,"LitObject"]; _canPickLight = false; +_myCharID = player getVariable ["CharacterID","0"]; _vehicleOwnerID = _vehicle getVariable ["CharacterID","0"]; _hasHotwireKit = "ItemHotwireKit" in _magazinesPlayer; _isPZombie = player isKindOf "PZombie_VB"; @@ -249,7 +250,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur _id = _uid; _ownerID = _cursorTarget getVariable ["ownerPUID","0"]; } else { - _id = dayz_characterID; + _id = _myCharID; _ownerID = _characterID; }; @@ -1147,7 +1148,7 @@ if (_dogHandle > 0) then { _dog = _dogHandle getFSMVariable "_dog"; if (isNil "_dog") exitWith {}; if (isNil "_ownerID") then {_ownerID = "0"}; - if (_canDo && !_inVehicle && alive _dog && !(_ownerID in [dayz_characterID,_uid])) then { + if (_canDo && !_inVehicle && alive _dog && !(_ownerID in [_myCharID,_uid])) then { if (s_player_movedog < 0) then { s_player_movedog = player addAction [localize "str_actions_movedog", "\z\addons\dayz_code\actions\dog\move.sqf", player getVariable ["dogID",0], 1, false, true]; };