Merge pull request #504 from EpochModTeam/experimental_curr

0.3.7.0416

Server_Install_Pack/sc/battleye/remoteexec.txt

@@ -1 +1 @@
-5 "" !="bis_fnc_execvm \[\[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE,true],\"initPlayerServer.sqf\"]" !="bis_fnc_effectkilled(airdestruction|secondaries) \[.+\]" !="epoch_server_checkplayer \[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE\]" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player|(upgrade|updateplayer|create|delete)Group) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(tradeRequest|equippeditem|packJack|create(object|AirDrop)|airDropCrate|destroytrash|unpackBackpack) \[.+\]" !="epoch_(localcleanup|fnc_saveplayer) \[.+\]"
+5 "" !="bis_fnc_execvm \[\[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE,(true|false)],\"initPlayerServer.sqf\"]" !="bis_fnc_effectkilled(airdestruction|secondaries) \[.+\]" !="epoch_server_checkplayer \[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE\]" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player|(upgrade|updateplayer|create|delete)Group) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(tradeRequest|equippeditem|packJack|create(object|AirDrop)|airDropCrate|destroytrash|unpackBackpack) \[.+\]" !="epoch_(localcleanup|fnc_saveplayer) \[.+\]"

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=415; 
+build=416; 

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=415; 
+build=416; 

Sources/epoch_server/init/server_init.sqf

@@ -52,9 +52,9 @@ if (isNil "_instanceID") exitWith{
     "Epoch: InstanceID missing!" call _abortAndError;
 };
 
-_activeAddons = activatedAddons;
+EPOCH_modCUPWeaponsEnabled = (getNumber (configFile >> "CfgPatches" >> "CUP_WheeledVehicles_Core" >> "requiredVersion") > 0);
-EPOCH_modCUPWeaponsEnabled = "caweapons" in _activeAddons;
+EPOCH_modCUPVehiclesEnabled = (getNumber (configFile >> "CfgPatches" >> "CUP_Weapons_WeaponsCore" >> "requiredVersion") > 0);
-EPOCH_modCUPVehiclesEnabled = "cawheeled" in _activeAddons;
+
 if (EPOCH_modCUPWeaponsEnabled) then {
     diag_log "Epoch: CUP Weapons detected";
 };

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=415; 
+build=416; 

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=415; 
+build=416; 

build.txt

@@ -1 +1 @@
-415 
+416