mirror of
https://github.com/EpochModTeam/Epoch.git
synced 2024-08-30 18:22:13 +00:00
fixes
Added the _allPlayers variable to complete the delete and readd to original Perm Group. Optimized forEach statements. Fixed use of _groupId with _permGroup
This commit is contained in:
parent
a59fc4aee2
commit
71f6c3db70
@ -22,7 +22,7 @@ if !([_player, _token] call EPOCH_server_getPToken) exitWith{};
|
||||
_return = false;
|
||||
_groupID = getPlayerUID _player;
|
||||
if (_groupID != "") then {
|
||||
|
||||
_allPlayers = allPlayers select {alive _x};
|
||||
{
|
||||
_group = grpNull;
|
||||
_permGroup = _x getVariable["GROUP",""];
|
||||
|
@ -43,10 +43,8 @@ if !(_contentArray isEqualTo []) then {
|
||||
if ((_x getVariable ["TEMPGROUP",""]) != _groupID) then {
|
||||
_group = grpNull;
|
||||
{
|
||||
if ((_x getVariable["TEMPGROUP",""]) == _groupID) exitWith {
|
||||
_group = group _x;
|
||||
};
|
||||
} forEach _allPlayers;
|
||||
_group = group _x;
|
||||
} forEach (_allPlayers select {(_x getVariable["TEMPGROUP", ""]) == _groupID});
|
||||
|
||||
if (isNull _group) then {
|
||||
_group = createGroup [west, true];
|
||||
@ -56,6 +54,7 @@ if !(_contentArray isEqualTo []) then {
|
||||
[_x] joinSilent _group;
|
||||
};
|
||||
} forEach (_allPlayers select {getPlayerUID _x == _selectedPlayerUID});
|
||||
|
||||
|
||||
// find player name from DB
|
||||
if (_selectedPlayerName == "Dead Player") then {
|
||||
@ -86,6 +85,7 @@ if !(_contentArray isEqualTo []) then {
|
||||
//Remove
|
||||
_found = false;
|
||||
_group = grpNull;
|
||||
_permGroup = "";
|
||||
{
|
||||
_permGroup = _x getVariable["GROUP",""];
|
||||
_playerObj = _x;
|
||||
@ -93,10 +93,8 @@ if !(_contentArray isEqualTo []) then {
|
||||
if !(_permGroup isEqualTo "")then
|
||||
{
|
||||
{
|
||||
if ((_x getVariable["GROUP",""]) == _groupID) exitWith {
|
||||
_group = group _x;
|
||||
};
|
||||
} forEach _allPlayers;
|
||||
_group = group _x;
|
||||
} forEach (_allPlayers select {(_x getVariable["GROUP", ""]) == _permGroup});
|
||||
};
|
||||
_playerObj setVariable ["TEMPGROUP", nil];
|
||||
if (isNull _group) then {
|
||||
|
Loading…
Reference in New Issue
Block a user