Merge pull request #510 from EpochModTeam/experimental_curr

0.3.7.0422

Changelogs/0.3.8.0.txt

@@ -42,3 +42,10 @@
 [Info] epochAH.hpp updated "antihack_checkFiles" for new file paths.
 [Info] Some AI Scripts Mods may not work with disableRemoteSensors enabled. You can disable with "disableRemoteSensors = false;" in CfgEpochClient.
 [Info] Removed old .bikey and added new one for 0380.
+
+Build: 422
+[Fixed] Disallow building inside of vehicles.
+[Fixed] Incorrectly enabled CUP vehicles and weapons support if only Core and Maps where enabled.
+[Fixed] removeExec Battleye kick fixed.
+[Fixed] Player getting stuck waiting for inventory to load.
+[Fixed] Delete base object if over limit.

Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf

@@ -28,6 +28,9 @@ _buildingAllowed = true;
 _ownedJammerExists = false;
 _nearestJammer = objNull;
 
+// reject building if in vehicle
+if (vehicle player != player)exitWith{["<t size = '1.6' color = '#99ffffff'>Building Disallowed: Inside Vehicle</t>", 5] call Epoch_dynamicText; false };
+
 // defaults
 _config = 'CfgEpochClient' call EPOCH_returnConfig;
 _buildingJammerRange = getNumber(_config >> "buildingJammerRange");

Sources/epoch_code/compile/building/EPOCH_staticMove.sqf

@@ -37,7 +37,9 @@ if (_item == "") exitWith{ EPOCH_target = objNull; };
 if (EPOCH_playerEnergy <= 0) exitWith{
 	["<t size = '1.6' color = '#99ffffff'>Need Energy</t>", 5] call Epoch_dynamicText;
 };
-if !("" call EPOCH_isBuildAllowed) exitWith{};
+
+// Remove object if not allowed
+if !("" call EPOCH_isBuildAllowed) exitWith{ deleteVehicle _object };
 EPOCH_simulSwap_Lock = true;
 
 _objType = typeOf _object;

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=417; 
+build=422; 

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=417; 
+build=422; 

Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf

@@ -135,7 +135,11 @@ if (_this isEqualType []) then {
 				_group = createGroup west;
 			};
 
+			_player setPosATL _location;
+
 			_newPlyr = _group createUnit[_class, _location, [], 0, "CAN_COLLIDE"];
+			// diag_log format["DEBUG: _newPlyr %1 %2 %3",_newPlyr, _location, getPosATL _newPlyr];
+
 			if !(isNull _newPlyr) then {
 
 				addToRemainsCollector[_newPlyr];

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=417; 
+build=422; 

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=417; 
+build=422; 

build.txt

@@ -1 +1 @@
-417 
+422