From a89a6e85111bd3d0e52256e337f51a6a152dc8bf Mon Sep 17 00:00:00 2001 From: shoopea Date: Fri, 14 Jun 2019 14:44:35 +0800 Subject: [PATCH] test --- obj.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/obj.go b/obj.go index 2302875..372e0bf 100644 --- a/obj.go +++ b/obj.go @@ -599,12 +599,20 @@ func getObjItemID(c string, n string) int64 { } func silentGetObjItemID(code string, name string) int64 { - if v, ok := cacheObjItem.Load(code); ok && len(code) > 0 { - item := v.(ChatWarsItem) - log.Printf("Matching item code %s with %s.\n", code, item.Code) - return item.ObjID64 + if len(code) > 0 { + if v, ok := cacheObjItem.Load(code); ok { + item := v.(ChatWarsItem) + log.Printf("Matching item code %s with %s.\n", code, item.Code) + return item.ObjID64 + } + if ok, _ := regexp.MatchString(`^u[0-9]+`, code); !ok { + return 0 + } } - if v, ok := cacheObjItem.Load(name); ok && len(name) > 0 { + if len(name) == 0 { + return 0 + } + if v, ok := cacheObjItem.Load(name); ok { item := v.(ChatWarsItem) log.Printf("Matching item name %s with %s.\n", name, item.Name) return item.ObjID64