Fixed bug with Operation's executor.

1297c475 · Vladislav Kiselev · 61b658ce · 1297c475
Commit 1297c475 authored Jun 20, 2019 by Vladislav Kiselev
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

src/inport/TaskCase.java src/inport/TaskCase.java +5 -1

No files found.
--- a/src/inport/TaskCase.java
+++ b/src/inport/TaskCase.java
@@ -718,7 +718,11 @@ public class TaskCase {
                            {
                                String[] items = rStr.substring(0, rStr.indexOf('[')).split(" ");

-                                op.setExecutor(m_vessel.get(Integer.valueOf(items[0].trim())));
+                                MovingObject ex = m_vessel.get(Integer.valueOf(items[0].trim()));
+                                if (ex == null) {
+                                    ex = m_bunker.get(Integer.valueOf(items[0].trim()));
+                                }
+                                op.setExecutor(ex);
                                if (items.length > 1) {
                                    op.setBunker(Optional.of(m_bunker.get(Integer.valueOf(items[1].trim()))));
                                }