Ticket #2580: command.js.diff

Commands.js

@@ -252 +252 @@
         if (CanControlUnit(cmd.entity, player, controlAllUnits))
         {
             var cmpTechnologyManager = QueryOwnerInterface(cmd.entity, IID_TechnologyManager);
-            if (cmpTechnologyManager.CanResearch(cmd.template))
+            if (!cmpTechnologyManager.IsTechnologyResearched(cmd.template))
             {
-                var queue = Engine.QueryInterface(cmd.entity, IID_ProductionQueue);
-                if (queue)
-                    queue.AddBatch(cmd.template, "technology");
+                if (cmpTechnologyManager.CanResearch(cmd.template))
+                {
+                    var queue = Engine.QueryInterface(cmd.entity, IID_ProductionQueue);
+                    if (queue)
+                        queue.AddBatch(cmd.template, "technology");
+                }
+                else if (g_DebugCommands)
+                {
+                    warn("Invalid command: Requirements to research technology are not met: " + uneval(cmd));
+                }
             }
             else if (g_DebugCommands)
             {
-                warn("Invalid command: Requirements to research technology are not met: " + uneval(cmd));
+                warn("Invalid command: Player "+player+" has already researched " + cmd.template.genericName);
             }
         }
         else if (g_DebugCommands)