From 9ba0febf000416b6cbf328485fc6f244da7059d0 Mon Sep 17 00:00:00 2001
From: nomisum <nomisum@googlemail.com>
Date: Sat, 3 Oct 2015 14:00:33 +0200
Subject: [PATCH] try fix spawn, jip,try fix spectator

---
 init.sqf                    | 12 +++++++++++-
 mission.sqm                 |  8 ++++----
 server/teleportListener.sqf |  1 -
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/init.sqf b/init.sqf
index ff4145eb..b47db18c 100644
--- a/init.sqf
+++ b/init.sqf
@@ -116,6 +116,16 @@ diag_log format ["setup: clientandserver done"];
 
 if (hasInterface) then {
 
+	checkJIP = {
+		if ((OPFOR_TELEPORT_TARGET select 0 != 0) && didJIP) then {
+			[player, true] call ace_spectator_fnc_stageSpectator;
+		} else {
+			[] spawn checkSpawnButton;
+		};
+	};
+
+	
+
 	checkSpawnButton = {
 		waitUntil {!dialog && !visibleMap};
 		if (BLUFOR_TELEPORTED) exitWith {};
@@ -123,7 +133,7 @@ if (hasInterface) then {
 	};
 
 	createStartHints = {
-		[] spawn checkSpawnButton;
+		[] call checkJIP;
 	};
 
 	enableSentences false;
diff --git a/mission.sqm b/mission.sqm
index 0595d3cb..7159a3e5 100644
--- a/mission.sqm
+++ b/mission.sqm
@@ -1155,8 +1155,9 @@ class Mission
 					id=23;
 					side="EAST";
 					vehicle="O_officer_F";
-					player="PLAY CDG";
-					rank="SERGEANT";
+					player="PLAYER COMMANDER";
+					leader=1;
+					rank="MAJOR";
 					skill=0.5;
 					text="opfor_teamlead";
 					init="this setVariable [""canBuy"", true];";
@@ -1171,7 +1172,6 @@ class Mission
 					side="EAST";
 					vehicle="O_Soldier_SL_F";
 					player="PLAY CDG";
-					leader=1;
 					rank="CAPTAIN";
 					skill=0.5;
 					text="opfor_assistant";
@@ -2157,7 +2157,7 @@ class Mission
 					id=82;
 					side="WEST";
 					vehicle="B_officer_F";
-					player="PLAYER COMMANDER";
+					player="PLAY CDG";
 					leader=1;
 					rank="MAJOR";
 					skill=0.5;
diff --git a/server/teleportListener.sqf b/server/teleportListener.sqf
index 116416f0..5f36386d 100644
--- a/server/teleportListener.sqf
+++ b/server/teleportListener.sqf
@@ -85,7 +85,6 @@ _OPFOR_TELEPORT_TARGET_listener = {
 
 _BLUFOR_TELEPORT_TARGET_listener = {
 	_pos = _this select 1;
-	_pos spawn createBluforStuff;
 	publicVariable "BLUFOR_TELEPORT_TARGET";
 };