Arma3_Exile/Exile_64bit_Conversion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8 from StokesMagee/master

Browse Source 
Fix virtual garage
This commit is contained in:
Brett Nordin 2018-03-15 10:58:31 -06:00 committed by GitHub
commit 442c5b00df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 79 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
@ExileServer/sql_custom/exile.ini
View File

@ -296,9 +296,9 @@ SQL1_1 = UPDATE vehicle SET territory_id = NULL, last_updated_at = NOW(), nickna
SQL1_INPUTS = 1
[confirmVehicleOwnership]
SQL1_1 = SELECT id, territory_id FROM vehicle WHERE nickname = ?
SQL1_1 = SELECT id, territory_id FROM vehicle WHERE nickname = ? AND territory_id = ?
SQL1_INPUTS = 1
SQL1_INPUTS = 1,2
OUTPUT = 1,2
[loadTerritoryVirtualGarage]

1
Exile Mission File/CfgExileCustomCode.cpp
View File

@ -36,3 +36,4 @@ ExileServer_object_container_database_insert = "Exile_Server_Overrides\ExileServ
ExileServer_object_container_createContainer = "Exile_Server_Overrides\ExileServer_object_container_createContainer.sqf";
ExileServer_object_construction_database_load = "Exile_Server_Overrides\ExileServer_object_construction_database_load.sqf";
ExileServer_object_construction_database_insert = "Exile_Server_Overrides\ExileServer_object_construction_database_insert.sqf";
ExileServer_object_vehicle_network_retrieveVehicleRequest = "Exile_Server_Overrides\ExileServer_object_vehicle_network_retrieveVehicleRequest.sqf";

76
Exile Mission File/Exile_Server_Overrides/ExileServer_object_vehicle_network_retrieveVehicleRequest.sqf Normal file
View File

@ -0,0 +1,76 @@
/**
* ExileServer_object_vehicle_network_retrieveVehicleRequest
*
* Exile Mod
* www.exilemod.com
* © 2015 Exile Mod Team
*
* This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
*/
private["_sessionID", "_parameters", "_nickname", "_playerObject", "_flagObject", "_territoryID", "_vehicleInfo", "_buildRights", "_storedVehicles", "_index"];
_sessionID = _this select 0;
_parameters = _this select 1;
_nickname = _parameters select 0;
try
{
_playerObject = _sessionID call ExileServer_system_session_getPlayerObject;
if (isNull _playerObject) then
{
throw "Player is null";
};
if (_playerObject getVariable ["ExileMutex",false]) then
{
throw "Player is Mutex";
};
_playerObject setVariable ["ExileMutex", true];
_flagObject = _playerObject call ExileClient_util_world_getTerritoryAtPosition;
if (isNull _flagObject) then
{
throw "Invalid Flag";
};
if (_flagObject getVariable [format["Exile%1Mutex", toLower(_nickname)], false]) then
{
throw "Vehicle is being processed by another player.";
};
_flagObject setVariable [format["Exile%1Mutex", toLower(_nickname)], true];
_territoryID = _flagObject getVariable ["ExileDatabaseID", -1];
_vehicleInfo = format["confirmVehicleOwnership:%1:%2", _nickname, _territoryID] call ExileServer_system_database_query_selectSingle;
if !((_vehicleInfo select 1) isEqualTo _territoryID) then
{
throw "Vehicle does not belong to this territory!";
};
_buildRights = _flagObject getVariable ["ExileTerritoryBuildRights", []];
if !((getPlayerUID _playerObject) in _buildRights) then
{
throw "You do not have rights to access this Virtual Garage";
};
_storedVehicles = _flagObject getVariable ["ExileTerritoryStoredVehicles", []];
_index = -1;
{
if (toLower(_x select 1) isEqualTo toLower(_nickname)) exitWith
{
_index = _forEachIndex;
};
}
forEach _storedVehicles;
if (_index isEqualTo -1) then
{
throw "Unable to find vehicle in stored vehicles";
};
_storedVehicles deleteAt _index;
_flagObject setVariable ["ExileTerritoryStoredVehicles", _storedVehicles, true];
format["retrieveVehicle:%1", _vehicleInfo select 0] call ExileServer_system_database_query_fireAndForget;
(_vehicleInfo select 0) call ExileServer_object_vehicle_database_load;
[_sessionID, "retrieveVehicleResponse", [true]] call ExileServer_system_network_send_to;
}
catch
{
[_sessionID, "retrieveVehicleResponse", [false]] call ExileServer_system_network_send_to;
[_sessionID, "toastRequest", ["ErrorTitleAndText", ["Retrieve Vehicle Failed!", _exception]]] call ExileServer_system_network_send_to;
_exception call ExileServer_util_log;
};
_flagObject setVariable [format["Exile%1Mutex", toLower(_nickname)], nil];
_playerObject setVariable ["ExileMutex", false];
true