--

dist/addons/sourcemod/scripting/draftpick.sp

@@ -8,7 +8,7 @@
 #include <empstats>
 #include <updater>
 
-#define PluginVersion "0.97" 
+#define PluginVersion "0.98" 
  
 #define UPDATE_URL    "https://sourcemod.docs.empiresmod.com/DraftPick/dist/updater.txt"
  
@@ -784,7 +784,7 @@ void StartBatchJoin(int client,int time)
 {
 	joiningPlayers.Push(client);
 	AntiGhostClient(client);
-	if(batchJoinTime == 0)
+	if(batchJoinTime <= 0)
 	{
 		batchJoinTime = time;
 		Handle timer = CreateTimer(1.0, Timer_BatchJoin,_,TIMER_REPEAT);
@@ -1988,8 +1988,9 @@ public Action correctSpec(Handle timer)
 // we don't know if it is comm map initially
 public Action StartDraft(Handle timer)
 {
-	// continuous modes only work on comm maps at the moment. 
-	if(EU_IsClassicMap())
+	// continuous modes only work on comm maps at the moment.
+	// make sure when reloading draft plugin we dont start the draft. 
+	if(!EU_HasGameStarted() && EU_IsClassicMap())
 	{
 		if(continuousMode > 0)
 		{
@@ -2981,17 +2982,24 @@ Stage_Game_End(int nextStage)
 	for(int i = 0;i<joiningPlayers.Length;i++)
 	{
 		int client = joiningPlayers.Get(i);
-		if(nextStage != STAGE_DISABLED)
-		{
-			// move the joining player directly to nf for redrafting.
-			ForceTeam(client,2);
-		}
-		else
+		// there was an major error where the player wasn't in game at this point
+		if(IsClientInGame(client))
 		{
-			// just autoassign the player if draft has been disabled.
-			FakeClientCommandEx(client, "jointeam 4");
+			
+			if(nextStage != STAGE_DISABLED)
+			{
+				// move the joining player directly to nf for redrafting.
+				ForceTeam(client,2);
+			}
+			else
+			{
+				// just autoassign the player if draft has been disabled.
+				FakeClientCommandEx(client, "jointeam 4");
+			}
+			joinTime[client] = -1;
 		}
-		joinTime[client] = -1;
+		
+		
 		
 	}
 	batchJoinTime = 0;

dist/updater.txt

@@ -4,7 +4,7 @@
 	{
 		"Version"
 		{
-			"Latest"	"0.97"
+			"Latest"	"0.98"
 		}
 	}