From a2eddeae4021b38e651c9238a739f42cd63befdb Mon Sep 17 00:00:00 2001
From: Oliver Brakmann <ob-web2013+github@posteo.net>
Date: Sat, 20 Dec 2014 19:29:35 +0100
Subject: [PATCH] Disable dev and player commands for observers

Fixes #6839
---
 OpenRA.Mods.Common/Commands/DevCommands.cs    | 6 ++++--
 OpenRA.Mods.Common/Commands/PlayerCommands.cs | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.Common/Commands/DevCommands.cs b/OpenRA.Mods.Common/Commands/DevCommands.cs
index 36b127b5d1..f12e332cf0 100644
--- a/OpenRA.Mods.Common/Commands/DevCommands.cs
+++ b/OpenRA.Mods.Common/Commands/DevCommands.cs
@@ -47,6 +47,9 @@ namespace OpenRA.Mods.Common.Commands
 
 		public void InvokeCommand(string name, string arg)
 		{
+			if (world.LocalPlayer == null)
+				return;
+
 			if (!world.AllowDevCommands)
 			{
 				Game.Debug("Cheats are disabled.");
@@ -91,8 +94,7 @@ namespace OpenRA.Mods.Common.Commands
 
 		static void IssueDevCommand(World world, string command)
 		{
-			if (world.LocalPlayer != null)
-				world.IssueOrder(new Order(command, world.LocalPlayer.PlayerActor, false));
+			world.IssueOrder(new Order(command, world.LocalPlayer.PlayerActor, false));
 		}
 
 		class DevException : Exception { }
diff --git a/OpenRA.Mods.Common/Commands/PlayerCommands.cs b/OpenRA.Mods.Common/Commands/PlayerCommands.cs
index b19c5d8fc8..131d6d637e 100644
--- a/OpenRA.Mods.Common/Commands/PlayerCommands.cs
+++ b/OpenRA.Mods.Common/Commands/PlayerCommands.cs
@@ -34,6 +34,9 @@ namespace OpenRA.Mods.Common.Commands
 
 		public void InvokeCommand(string name, string arg)
 		{
+			if (world.LocalPlayer == null)
+				return;
+
 			switch (name)
 			{
 				case "pause":