Merge branch 'master' into fix-map-LOD-table

[gamemodes]/[race]/race/racevoting_server.lua

@@ -22,7 +22,7 @@ function displayHilariarseMessage( player )
 		if playerName == lastVoteStarterName then
 			lastVoteStarterCount = lastVoteStarterCount + 1
 			if lastVoteStarterCount == 5 then
-				msg = playerName .. ' started a vote. Hardly a suprise.'
+				msg = playerName .. ' started a vote. Hardly a surprise.'
 			elseif lastVoteStarterCount == 10 then
 				msg = 'Guess what! '..playerName .. ' started ANOTHER vote!'
 			elseif lastVoteStarterCount < 5 then

[gameplay]/playercolors/playercolors.lua

@@ -1,6 +1,8 @@
 local lowerBound, upperBound = unpack(get("color_range"))
 
-function randomizePlayerColor(player)
+local freeroamRunning = false
+
+local function randomizePlayerColor(player)
 	player = player or source
 	local r, g, b = math.random(lowerBound, upperBound), math.random(lowerBound, upperBound), math.random(lowerBound, upperBound)
 	setPlayerNametagColor(player, r, g, b)
@@ -16,13 +18,29 @@ local function setAllPlayerColors()
 		end
 	end
 end
-addEventHandler("onResourceStart", resourceRoot, setAllPlayerColors)
-addEventHandler("onGamemodeMapStart", root, setAllPlayerColors) -- mapmanager resets player colors to white when the map ends
-addEventHandler("onResourceStop", resourceRoot, setAllPlayerColors)
+-- mapmanager resets player colors to white when the map ends
+addEventHandler("onGamemodeMapStart", root, setAllPlayerColors)
+
+local function handleResourceStartStop(res)
+	if res == resource then
+		local freeroamResource = getResourceFromName("freeroam")
+		if freeroamResource then
+			freeroamRunning = getResourceState(freeroamResource) == "running"
+		end
+		setAllPlayerColors()
+	elseif getResourceName(res) == "freeroam" then
+		freeroamRunning = eventName == "onResourceStart"
+	end
+end
+addEventHandler("onResourceStart", root, handleResourceStartStop)
+addEventHandler("onResourceStop", root, handleResourceStartStop)
 
 addEventHandler('onPlayerChat', root,
 	function(msg, type)
 		if type == 0 then
+			if freeroamRunning then
+				return -- Let freeroam handle chat
+			end
 			cancelEvent()
 			local r, g, b = getPlayerColor(source)
 			local name = getPlayerName(source)