From 43f62d224f5475243e9deff3ffba21336824fd53 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 5 Feb 2022 21:04:03 +0000
Subject: [PATCH] ops/factorio/multiworld: prohibit /ws while hand-crafting

---
 ops/factorio/multiworld/multiworld.lua | 5 +++++
 ops/nixos/clouvider-lon01/default.nix  | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ops/factorio/multiworld/multiworld.lua b/ops/factorio/multiworld/multiworld.lua
index 9b1aaeea60..f88b6584af 100644
--- a/ops/factorio/multiworld/multiworld.lua
+++ b/ops/factorio/multiworld/multiworld.lua
@@ -169,6 +169,11 @@ end
 local function port_player_to_world(player, surface)
     local p = player.print
 
+    if player.crafting_queue_size > 0 then
+        p("Can't port between worlds while crafting", c)
+        return
+    end
+
     player.clear_cursor()
     save_inventories(player, get_saved_inventory(player.surface, player))
 
diff --git a/ops/nixos/clouvider-lon01/default.nix b/ops/nixos/clouvider-lon01/default.nix
index 3022cf916b..794e9021c5 100644
--- a/ops/nixos/clouvider-lon01/default.nix
+++ b/ops/nixos/clouvider-lon01/default.nix
@@ -294,5 +294,9 @@ in {
     "[2a0a:54c0:0:17::2]"
   ];
 
+  environment.systemPackages = [
+    depot.ops.factorio.multiworld
+  ];
+
   system.stateVersion = "20.09";
 }