prevent logout with d/c #1938

Should work to prevent the issue described in #1938 by disabling the abort option, causing the player to alt + F4 if they want to log out without reconnecting. which results in the gear pile/weaponholder from not being created.
This commit is contained in:
icomrade
2017-07-26 12:39:37 -04:00
parent 5acad04c43
commit 73926b8785
4 changed files with 16 additions and 3 deletions

View File

@@ -51,6 +51,7 @@
[FIXED] The dramatic recoil camera shake effect from a nearby bullet hit is now reset correctly instead of remaining permanent. [FIXED] The dramatic recoil camera shake effect from a nearby bullet hit is now reset correctly instead of remaining permanent.
[FIXED] Added temporary fix for missing AS50 ammo error with beta branch core patch. #1955 @AirwavesMan [FIXED] Added temporary fix for missing AS50 ammo error with beta branch core patch. #1955 @AirwavesMan
[FIXED] Melee and tranquilizer bolt knockouts were usually instant or far shorter than the intended time of 20s-80s. [FIXED] Melee and tranquilizer bolt knockouts were usually instant or far shorter than the intended time of 20s-80s.
[FIXED] Multiple dupe fixes
[NOTE] Fixes below are included in the mission file and server pbo as part of server package 1.0.6.1A (March 10th 2017) [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. [FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions.

View File

@@ -1,5 +1,11 @@
private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_oldGroup","_idc","_display","_switchUnit","_leader","_currentCamera"]; private ["_weapons","_CID","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_oldGroup","_idc","_display","_switchUnit","_leader","_currentCamera"];
_class = _this; if (typeName _this == "ARRAY") then {
_class = _this select 0;
_CID = _this select 1;
} else {
_class = _this;
};
if (gear_done) then {disableUserInput true;disableUserInput true;}; if (gear_done) then {disableUserInput true;disableUserInput true;};
disableSerialization; disableSerialization;
//Old location system causes issues with players getting damaged during movement. //Old location system causes issues with players getting damaged during movement.
@@ -74,10 +80,13 @@ _leader = (player == leader _oldGroup);
//[player] joinSilent grpNull; //[player] joinSilent grpNull;
_group = createGroup west; _group = createGroup west;
_newUnit = _group createUnit [_class,respawn_west_original,[],0,"NONE"]; _newUnit = _group createUnit [_class,respawn_west_original,[],0,"NONE"];
_newUnit allowDamage false;
_newUnit setDir _dir; _newUnit setDir _dir;
{_newUnit removeMagazine _x;} count magazines _newUnit; {_newUnit removeMagazine _x;} count magazines _newUnit;
removeAllWeapons _newUnit; removeAllWeapons _newUnit;
if (!isnil "_CID") then {_newUnit setVariable ["characterID",_CID,true];}; //set early to prevent dupe
//Equip New Character //Equip New Character
{ {
if (typeName _x == "ARRAY") then {if (count _x > 0) then {_newUnit addMagazine [_x select 0,_x select 1]; }; } else { _newUnit addMagazine _x; }; if (typeName _x == "ARRAY") then {if (count _x > 0) then {_newUnit addMagazine [_x select 0,_x select 1]; }; } else { _newUnit addMagazine _x; };

View File

@@ -105,7 +105,8 @@ if (isServer) then {
if (dayz_groupSystem) then { if (dayz_groupSystem) then {
"PVDZ_Server_UpdateGroup" addPublicVariableEventHandler {(_this select 1) spawn server_updateGroup}; "PVDZ_Server_UpdateGroup" addPublicVariableEventHandler {(_this select 1) spawn server_updateGroup};
}; };
"PVDZE_PingSend" addPublicVariableEventHandler {PVDZE_PingReceived = 1; (owner (_this select 1)) publicVariableClient "PVDZE_PingReceived";};
//Added as part of the maintenance system to allow the server to replace the damaged model with a normal model. //Added as part of the maintenance system to allow the server to replace the damaged model with a normal model.
/*"PVDZ_object_replace" addPublicVariableEventHandler { /*"PVDZ_object_replace" addPublicVariableEventHandler {
_object = _this select 1; _object = _this select 1;
@@ -322,4 +323,5 @@ if (!isDedicated) then {
// flies and swarm sound sync // flies and swarm sound sync
call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\client_flies.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\client_flies.sqf";
}; };
"PVDZE_PingReceived" addPublicVariableEventHandler {DZE_LastPingResp = diag_tickTime;};
}; };

View File

@@ -567,6 +567,7 @@ if (isServer) then {
}; };
if (!isDedicated) then { if (!isDedicated) then {
DZE_LastPingResp = diag_tickTime;
dayz_buildingBubbleMonitor = []; dayz_buildingBubbleMonitor = [];
DayZ_fuelCans = ["ItemJerrycan","ItemFuelcan","ItemFuelBarrel"]; DayZ_fuelCans = ["ItemJerrycan","ItemFuelcan","ItemFuelBarrel"];
DayZ_fuelCansEmpty = ["ItemJerrycanEmpty","ItemFuelcanEmpty","ItemFuelBarrelEmpty"]; DayZ_fuelCansEmpty = ["ItemJerrycanEmpty","ItemFuelcanEmpty","ItemFuelBarrelEmpty"];