From 47a017b40a347e3cde7986ec61187fa02f1e6100 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Fri, 23 Aug 2019 18:37:33 +0800
Subject: [PATCH] another fix for item cache

---
 obj.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/obj.go b/obj.go
index 6dd9fc9..d9ad648 100644
--- a/obj.go
+++ b/obj.go
@@ -775,6 +775,7 @@ func getSilentObjItemID(code string, name string) int64 {
 func loadObjItem() error {
 	var (
 		id      int64
+		type_id int64
 		intl_id string
 		name    string
 		weight  int
@@ -788,19 +789,20 @@ func loadObjItem() error {
 	cacheObjItemId = make(map[int64]ChatWarsItem)
 	muxObjItemId.Unlock()
 
-	items, err := db.Query(`SELECT oi.obj_id, oi.intl_id, obn.name, oi.weight FROM obj_item oi, obj_name obn WHERE obn.obj_id = oi.obj_id AND obn.priority = 0;`)
+	items, err := db.Query(`SELECT oi.obj_id, o.obj_sub_type_id, oi.intl_id, obn.name, oi.weight FROM obj o, obj_item oi, obj_name obn WHERE o.id = oi.obj_id AND obn.obj_id = oi.obj_id AND obn.priority = 0;`)
 	if err != nil {
 		return err
 	}
 	defer items.Close()
 
 	for items.Next() {
-		err = items.Scan(&id, &intl_id, &name, &weight)
+		err = items.Scan(&id, &type_id, &intl_id, &name, &weight)
 		if err != nil {
 			return err
 		}
 		c := new(ChatWarsItem)
 		c.ObjID64 = id
+		c.ItemTypeID = type_id
 		c.Code = intl_id
 		c.Name = name
 		c.Weight = weight