Index: rts/Game/GameSetup.cpp
===================================================================
--- rts/Game/GameSetup.cpp	(revision 4092)
+++ rts/Game/GameSetup.cpp	(working copy)
@@ -146,13 +146,17 @@
 				teamStartNum[a]=a;
 		} else {								//random order
 			std::multimap<int,int> startNums;
-			for(int a=0;a<gs->activeTeams;++a)
+			int numToRandomize=gs->activeTeams;
+			if(gs->useLuaGaia) { numToRandomize--; }	//don't randomize gaia
+			for(int a=0;a<numToRandomize;++a)
 				startNums.insert(pair<int,int>(gu->usRandInt(),a));	//server syncs these later
 			int b=0;
 			for(std::multimap<int,int>::iterator si=startNums.begin();si!=startNums.end();++si){
 				teamStartNum[si->second]=b;
 				++b;
 			}
+			if(gs->useLuaGaia)
+				teamStartNum[gs->activeTeams-1]=gs->activeTeams-1;	//add gaia at the end
 		}
 	}
 	for(int a=0;a<numPlayers;++a){