Dont use item palettes in createitems command.

2 files changed, 4 insertions, 23 deletions

diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 014ae10f8..feba9dcaa 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -1485,18 +1485,7 @@ impHandler0(createItems)
         if (colors >= 255)
             colors = 254;
 
-        if (!colors)
-        {
-            dialog->addItem(id, 0, ItemColor_one, 100, 0);
-        }
-        else
-        {
-            for (int f = 0; f < colors; f ++)
-            {
-                if (!info->getColor(fromInt(f, ItemColor)).empty())
-                    dialog->addItem(id, 0, fromInt(f, ItemColor), 100, 0);
-            }
-        }
+        dialog->addItem(id, 0, ItemColor_one, 100, 0);
     }
     dialog->sort();
     return true;
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 2cc98acb0..455f9acb2 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -75,19 +75,11 @@ void AdminHandler::ipcheckName(const std::string &name) const
 }
 
 void AdminHandler::createItems(const int id,
-                               const ItemColor color,
+                               const ItemColor color A_UNUSED,
                                const int amount) const
 {
-    if (!serverFeatures->haveItemColors())
-    {
-        chatHandler->talk(strprintf("@item %d %d",
-            id, amount), GENERAL_CHANNEL);
-    }
-    else
-    {
-        chatHandler->talk(strprintf("@item %d %d %d",
-            id, toInt(color, int), amount), GENERAL_CHANNEL);
-    }
+    chatHandler->talk(strprintf("@item %d %d", id, amount),
+        GENERAL_CHANNEL);
 }
 
 void AdminHandler::processKickAck(Net::MessageIn &msg)