From 0e174700a13d4d43b5e1f50284065e9fb2168177 Mon Sep 17 00:00:00 2001 From: He-Man Date: Wed, 10 Aug 2016 17:24:43 +0200 Subject: [PATCH 1/2] Update EPOCH_server_takeCrypto.sqf --- .../epoch_trading/EPOCH_server_takeCrypto.sqf | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf b/Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf index d0cf847e..8d823816 100644 --- a/Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf +++ b/Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf @@ -24,20 +24,7 @@ if (_getCrypto > 0) then { // remove crypto from object _object setVariable["Crypto", nil, true]; - - // get vars array and current Crypto value - _cIndex = EPOCH_customVars find "Crypto"; - _vars = _player getVariable["VARS", call EPOCH_defaultVars_SEPXVar]; - _current_crypto = _vars select _cIndex; - - _playerCryptoLimit = EPOCH_customVarLimits select _cIndex; - _playerCryptoLimit params ["_playerCryptoLimitMax","_playerCryptoLimitMin"]; - _current_crypto = ((_current_crypto + _getCrypto) min _playerCryptoLimitMax) max _playerCryptoLimitMin; - // send to player - _current_crypto remoteExec ['EPOCH_effectCrypto',_player]; - _vars set[_cIndex, _current_crypto]; - _player setVariable["VARS", _vars]; - + [_player,_getCrypto] call EPOCH_server_effectCrypto; // debug and logging. diag_log format["Epoch: ADMIN: %1 picked up %2 Crypto from object %3 with puid %4 at %5", getPlayerUID _player, _current_crypto, [_object, typeOf _object],_object getVariable['PUID', ''],getposATL _object]; }; From 97207eafe59807b6cf8b591d1fae9c885f1d1019 Mon Sep 17 00:00:00 2001 From: He-Man Date: Wed, 10 Aug 2016 17:29:15 +0200 Subject: [PATCH 2/2] Update EPOCH_server_takeCrypto.sqf --- .../compile/epoch_trading/EPOCH_server_takeCrypto.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf b/Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf index 8d823816..d28779ff 100644 --- a/Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf +++ b/Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf @@ -12,7 +12,7 @@ Github: https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeTrade.sqf */ -private ["_cIndex","_vars","_current_crypto","_change","_player","_object","_player1","_player2","_getCrypto"]; +private ["_current_crypto","_player","_object","_getCrypto"]; params ["_player",["_token","",[""]],"_object"]; if !([_player,_token] call EPOCH_server_getPToken) exitWith {};