From 1294bf5c40c02f558d210fbf93c86f924e5638e2 Mon Sep 17 00:00:00 2001
From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
Date: Wed, 15 Nov 2023 22:08:36 +1300
Subject: [PATCH] Fix AAI Loader entity order #109

---
 boblogistics/prototypes/aai-loaders.lua | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/boblogistics/prototypes/aai-loaders.lua b/boblogistics/prototypes/aai-loaders.lua
index 7e2ddfbf4..94c15cf40 100644
--- a/boblogistics/prototypes/aai-loaders.lua
+++ b/boblogistics/prototypes/aai-loaders.lua
@@ -225,8 +225,9 @@ if mods["aai-loaders"] then
     end
   end
 
+  -- Clear entity.order so they use item.order
   -- Set subgroup
-  for index, item_name in pairs({
+  for index, loader_name in pairs({
     "aai-basic-loader",
     "aai-loader",
     "aai-fast-loader",
@@ -234,10 +235,14 @@ if mods["aai-loaders"] then
     "aai-turbo-loader",
     "aai-ultimate-loader",
   }) do
-    local item = data.raw.item[item_name]
+    local item = data.raw.item[loader_name]
     if item then
       item.subgroup = "bob-logistic-tier-" .. (index - 1)
     end
+    local entity = data.raw["loader-1x1"][loader_name]
+    if entity then
+      entity.order = nil
+    end
   end
 
   -- Add prerequisites