From 6d60143638699599414ed23d59a3e821467d731b Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Tue, 23 Jan 2018 14:00:44 -0500
Subject: release v18.1.23

---
 CHANGELOG             | 2 ++
 src/map/atcommand.cpp | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 11db1c8..a9d33ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+v18.1.23
+  - fixed a crash that happened when trying to create item id 0
 v18.1.3
   - remove mob timers (unused)
   - properly clear timers of all npcs (not just script)
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 718b6f0..cf872de 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -1419,7 +1419,7 @@ ATCE atcommand_item(Session *s, dumb_ptr<map_session_data> sd,
 
     P<struct item_data> item_data = TRY_UNWRAP(extract_item_opt(item_name), return ATCE::EXIST);
     ItemNameId item_id = item_data->nameid;
-    assert (item_id);
+    assert(item_id >= wrap<ItemNameId>(0));
 
     {
         get_count = number;
@@ -3859,7 +3859,7 @@ ATCE atcommand_chardelitem(Session *s, dumb_ptr<map_session_data> sd,
 
     P<struct item_data> item_data = TRY_UNWRAP(extract_item_opt(item_name), return ATCE::EXIST);
     ItemNameId item_id = item_data->nameid;
-    assert (item_id);
+    assert(item_id >= wrap<ItemNameId>(0));
 
     {
         dumb_ptr<map_session_data> pl_sd = map_nick2sd(character);
-- 
cgit v1.2.3-60-g2f50