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

Better checks for removing the owner of plots/doors

Browse Source 
Revert
f0e8796996

Partial revert:
2f0774d531 (diff-c3aa237d9007054fc3a724116a5d9f1a)

This is a better check for removing the owner of plots/doors based on
conversations on discord.
Plot/door owner can remove them selves
plot/door friends can't remove plot owner
plot/door admins can remove anyone
This commit is contained in:
oiad
2017-10-24 20:19:21 +13:00
parent 7a8d23bdeb
commit 64b5659bbd
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SQF/dayz_code/actions/doorManagement/doorRemoveFriend.sqf
View File

@@ -1,15 +1,16 @@
private ["_pos","_friends","_toRemove","_newList"];
private ["_pos","_friends","_toRemove","_newList","_ownerPUID"];
_pos = _this select 0;
if (_pos < 0) exitWith {};
_friends = TheDoor getVariable ["doorfriends", []];
_ownerPUID = TheDoor getVariable ["ownerPUID","0"];
_toRemove = (_friends select _pos);
if ((_toRemove select 0) == ((_friends select 0) select 0) && (!(dayz_playerUID in DZE_doorManagementAdmins) && !(dayz_playerUID == ((_friends select 0) select 0)))) exitWith {systemChat localize "STR_EPOCH_DOORMANAGEMENT_CANT_REMOVE";};
if ((_toRemove select 0) == _ownerPUID && (!(dayz_playerUID in DZE_doorManagementAdmins) && !(dayz_playerUID == _ownerPUID))) exitWith {systemChat localize "STR_EPOCH_DOORMANAGEMENT_CANT_REMOVE";};
_newList = [];
{
if(_x select 0 != _toRemove select 0) then {
if (_x select 0 != _toRemove select 0) then {
_newList set [count _newList, _x ];
};
} forEach _friends;

17
SQF/dayz_code/actions/plotManagement/plotRemoveFriend.sqf
View File

@@ -1,31 +1,22 @@
private ["_pos","_plots","_thePlot","_friends","_toRemove","_newList","_hasPole"];
private ["_pos","_plots","_thePlot","_friends","_toRemove","_newList","_ownerPUID"];
_pos = _this select 0;
if (_pos < 0) exitWith {};
_plots = ([player] call FNC_getPos) nearEntities ["Plastic_Pole_EP1_DZ",15];
_thePlot = _plots select 0;
_friends = _thePlot getVariable ["plotfriends", []];
_ownerPUID = _thePlot getVariable ["ownerPUID","0"];
_toRemove = (_friends select _pos);
_hasPole = false;
_newList = [];
if ((_toRemove select 0) == ((_friends select 0) select 0) && (!(dayz_playerUID in DZE_PlotManagementAdmins) && !(dayz_playerUID == ((_friends select 0) select 0)))) exitWith {systemChat localize "STR_EPOCH_PLOTMANAGEMENT_CANT_REMOVE";};
if (DZE_limitPlots && {!(dayz_playerUID in DZE_PlotManagementAdmins)}) then {
{
if (_x getVariable["ownerPUID","0"] == dayz_playerUID || (_x getVariable["CharacterID","0"] == dayz_characterID) || ((((_x getVariable ["plotfriends",[]]) select 0) select 0) == dayz_playerUID) && (_x != _thePlot)) exitWith {
_hasPole = true;
};
} count (entities "Plastic_Pole_EP1_DZ");
};
if (_hasPole) exitWith {systemChat localize "STR_EPOCH_PLAYER_133";};
if ((_toRemove select 0) == _ownerPUID && (!(dayz_playerUID in DZE_PlotManagementAdmins) && !(dayz_playerUID == _ownerPUID))) exitWith {systemChat localize "STR_EPOCH_PLOTMANAGEMENT_CANT_REMOVE";};
{
if (_x select 0 != _toRemove select 0) then {
_newList set [(count _newList), _x];
};
} count _friends;
_thePlot setVariable ["plotfriends", _newList, true];
PVDZ_veh_Save = [_thePlot,"gear"];

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

@@ -45,7 +45,7 @@ if (_isPole) then {
_distance = DZE_PlotPole select 1;
if (DZE_limitPlots && {!(dayz_playerUID in DZE_PlotManagementAdmins)}) then {
{
if (_x getVariable["ownerPUID","0"] == dayz_playerUID || (_x getVariable["CharacterID","0"] == dayz_characterID) || ((((_x getVariable ["plotfriends",[]]) select 0) select 0) == dayz_playerUID)) exitWith {
if (_x getVariable["ownerPUID","0"] == dayz_playerUID || (_x getVariable["CharacterID","0"] == dayz_characterID)) exitWith {
_hasPole = true;
};
} count (entities "Plastic_Pole_EP1_DZ");