From abb0475d28223182c73131d4ef40d8a50b67433b Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sun, 30 Oct 2016 13:54:55 -0400 Subject: [PATCH] Use joinSilent instead of join --- SQF/dayz_code/compile/player_switchModel.sqf | 2 +- SQF/dayz_code/groups/disbandGroup.sqf | 2 +- SQF/dayz_code/groups/groupMarkers.sqf | 3 +-- SQF/dayz_code/groups/init.sqf | 4 ++-- SQF/dayz_code/groups/joinGroup.sqf | 2 +- SQF/dayz_code/groups/kickFromGroup.sqf | 2 +- SQF/dayz_code/groups/leaveGroup.sqf | 2 +- SQF/dayz_code/groups/server_updateGroup.sqf | 5 +++++ SQF/dayz_code/init/publicEH.sqf | 1 - 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index 45e8418b3..dc1e441ff 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -124,7 +124,7 @@ _switchUnit = { {_oldUnit removeMagazine _x;} count magazines _oldUnit; if !(isNull _oldUnit) then {deleteVehicle _oldUnit;}; if (!isNil "dayz_groupInit" && count (units _oldGroup) > 1) then { - [_newUnit] join _oldGroup; + [_newUnit] joinSilent _oldGroup; if (count (units _group) == 0) then {deleteGroup _group;}; }; if (count (units _oldGroup) == 0) then {deleteGroup _oldGroup;}; diff --git a/SQF/dayz_code/groups/disbandGroup.sqf b/SQF/dayz_code/groups/disbandGroup.sqf index 5b08280ec..c66821061 100644 --- a/SQF/dayz_code/groups/disbandGroup.sqf +++ b/SQF/dayz_code/groups/disbandGroup.sqf @@ -11,6 +11,6 @@ dayz_groupDisbandThread = _group spawn { //Wait for response from server to confirm group finished updating in DB waitUntil {!isNil "dayz_groupDisbanded"}; - {[_x] join grpNull} count (units _this); + {[_x] joinSilent grpNull} count (units _this); deleteGroup _this; }; \ No newline at end of file diff --git a/SQF/dayz_code/groups/groupMarkers.sqf b/SQF/dayz_code/groups/groupMarkers.sqf index 8df34313e..1d411fd0d 100644 --- a/SQF/dayz_code/groups/groupMarkers.sqf +++ b/SQF/dayz_code/groups/groupMarkers.sqf @@ -4,7 +4,7 @@ private ["_count","_found","_group","_hasGPS","_index","_marker","_markBody","_m _group = player call dayz_filterGroup; if (dayz_requireRadio && {count _group > 1} && {!("ItemRadio" in items player)}) exitWith { - [player] join grpNull; + [player] joinSilent grpNull; _group = []; if (!isNull findDisplay 80000) then {findDisplay 80000 closeDisplay 2;}; localize "STR_EPOCH_RADIO_CONTACT_LOST" call dayz_rollingMessages; @@ -43,7 +43,6 @@ if (visibleMap or !isNull findDisplay 88890) then { if (_markBody) then { _found = false; { - //Only mark closest body to player's current position (allDead is sorted by distance) if (_x getVariable["bodyName",""] == name player) exitWith { _found = true; _pos = [_x] call FNC_GetPos; diff --git a/SQF/dayz_code/groups/init.sqf b/SQF/dayz_code/groups/init.sqf index b9cb818dd..e61ae0f82 100644 --- a/SQF/dayz_code/groups/init.sqf +++ b/SQF/dayz_code/groups/init.sqf @@ -1,7 +1,7 @@ private "_oldGroup"; if (count (units group player) > 1) then { - [player] join grpNull; + [player] joinSilent grpNull; }; if (count dayz_myGroup > 1 && {!dayz_requireRadio or {dayz_requireRadio && "ItemRadio" in items player}}) then { @@ -9,7 +9,7 @@ if (count dayz_myGroup > 1 && {!dayz_requireRadio or {dayz_requireRadio && "Item //Only auto join player into group if leader is in their savedGroup if (getPlayerUID leader _x in dayz_myGroup) exitWith { _oldGroup = group player; - [player] join _x; + [player] joinSilent _x; if (count (units _oldGroup) == 0) then {deleteGroup _oldGroup;}; // Update saved group in DB diff --git a/SQF/dayz_code/groups/joinGroup.sqf b/SQF/dayz_code/groups/joinGroup.sqf index 76f90f10b..c173bf916 100644 --- a/SQF/dayz_code/groups/joinGroup.sqf +++ b/SQF/dayz_code/groups/joinGroup.sqf @@ -25,7 +25,7 @@ _inviter = _inviterUID call dayz_getPlayer; if (!isNull _inviter) then { _oldGroup = group player; - [player] join (group _inviter); + [player] joinSilent (group _inviter); if (count (units _oldGroup) == 0) then {deleteGroup _oldGroup;}; // Update saved group in DB diff --git a/SQF/dayz_code/groups/kickFromGroup.sqf b/SQF/dayz_code/groups/kickFromGroup.sqf index 3159953f5..5874ff2c5 100644 --- a/SQF/dayz_code/groups/kickFromGroup.sqf +++ b/SQF/dayz_code/groups/kickFromGroup.sqf @@ -7,7 +7,7 @@ _target = _targetUID call dayz_getPlayer; if (isNull _target or _target == player or player != leader group player) exitWith {}; -[_target] join grpNull; +[_target] joinSilent grpNull; PVDZ_Server_UpdateGroup = [2,player,_targetUID]; publicVariableServer "PVDZ_Server_UpdateGroup"; diff --git a/SQF/dayz_code/groups/leaveGroup.sqf b/SQF/dayz_code/groups/leaveGroup.sqf index 33b20facb..8f2a07d3d 100644 --- a/SQF/dayz_code/groups/leaveGroup.sqf +++ b/SQF/dayz_code/groups/leaveGroup.sqf @@ -10,5 +10,5 @@ publicVariableServer "PVDZ_Server_UpdateGroup"; dayz_groupLeaveThread = [] spawn { //Wait for response from server to confirm group finished updating in DB waitUntil {!isNil "dayz_groupLeft"}; - [player] join grpNull; + [player] joinSilent grpNull; }; \ No newline at end of file diff --git a/SQF/dayz_code/groups/server_updateGroup.sqf b/SQF/dayz_code/groups/server_updateGroup.sqf index 85b27110c..914de40f5 100644 --- a/SQF/dayz_code/groups/server_updateGroup.sqf +++ b/SQF/dayz_code/groups/server_updateGroup.sqf @@ -5,6 +5,11 @@ _player = _this select 1; _targetUID = if (count _this > 2) then {_this select 2} else {"0"}; _playerUID = getPlayerUID _player; +if (_event < 3) then { + //Small delay needed for group changes to propagate to server + uiSleep 1; +}; + _groupUIDs = []; { if (alive _x && isPlayer _x) then { diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index db2989bab..c70d4fc0f 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -103,7 +103,6 @@ if (isServer) then { "PVDZE_handleSafeGear" addPublicVariableEventHandler {(_this select 1) spawn server_handleSafeGear}; "PVDZE_fullobj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishFullObject}; // PlotForLife take base ownership if (dayz_groupSystem) then { - //Use spawn instead of call because small delay is needed for group changes to propagate to server "PVDZ_Server_UpdateGroup" addPublicVariableEventHandler {(_this select 1) spawn server_updateGroup}; };