Skip to content

Commit 6f4f827

Browse files
committed
Fix versioning and gear module (locality issue)
1 parent 2dc2519 commit 6f4f827

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

core/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4
1+
5

mission.sqm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Mission
2525
randomSeed=4656359;
2626
class Intel
2727
{
28-
briefingName="CO14 Apple Core v5";
28+
briefingName="CO14 Apple Core v6";
2929
briefingDescription="Core Framework Showcase Mission";
3030
startWeather=0.39999998;
3131
forecastWeather=0.25;

modules/gear/module.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class gear
33
{
44
name = "Gear Module";
55
authors[] = {"Naught"};
6-
version = 2;
6+
version = 4;
77
required_version = 1;
88
url = "https://github.com/unitedoperations/Core-framework";
99
preinit = "preinit.sqf";

modules/gear/preinit.sqf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ gear_fnc_setLoadout = {
3232
private ["_obj"];
3333
_obj = _this select 0;
3434

35-
if (!isDedicated) then {
36-
waitUntil {!isNull player};
37-
};
35+
if (isMultiplayer && isDedicated && {isPlayer _obj}) exitWith {}; // Servers don't load player gear!
36+
if (!isDedicated) then {waitUntil {!isNull player}}; // Clients must wait for server unit hand-over.
3837

3938
if (local _obj) then {
4039
if (_obj isKindOf "Man") then {

0 commit comments

Comments
 (0)