From 1ac522a2e00a4af1fd31b11b24e59d315fdb26a8 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Tue, 20 Oct 2026 08:27:47 -0400
Subject: [PATCH] Fix /makeitem failing to persist items

MakeItemCmd left the container at NONE, which item_CREATE's cont
parameter rejects, so PERSIST returned null and addItemToInventory
threw a NullPointerException. Set the container to INVENTORY as
CreateItemCmd does, and report an error if PERSIST still fails.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/engine/devcmd/cmds/MakeItemCmd.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/engine/devcmd/cmds/MakeItemCmd.java b/src/engine/devcmd/cmds/MakeItemCmd.java
index 5c3d6340..d1973505 100644
--- a/src/engine/devcmd/cmds/MakeItemCmd.java
+++ b/src/engine/devcmd/cmds/MakeItemCmd.java
@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
+import engine.mbEnums.ItemContainerType;
 import engine.mbEnums.ItemType;
 import engine.mbEnums.OwnerType;
 import engine.objects.*;
@@ -169,6 +170,7 @@ public class MakeItemCmd extends AbstractDevCmd {
             Item item = new Item(templateID);
             item.ownerID = pc.getObjectUUID();
             item.ownerType = OwnerType.PlayerCharacter;
+            item.containerType = ItemContainerType.INVENTORY;
 
             if (numItems > 1)
                 item.setNumOfItems(numItems);
@@ -180,6 +182,11 @@ public class MakeItemCmd extends AbstractDevCmd {
                 return;
             }
 
+            if (item == null) {
+                throwbackError(pc, "DB error 2: Unable to create item " + templateID + ".");
+                return;
+            }
+
             //create prefix
             if (!prefix.isEmpty())
                 item.addPermanentEnchantmentForDev(prefix, 0);