From 0d29bee4c1f3a1b3275247bc72e042c242187e8b Mon Sep 17 00:00:00 2001 From: shoopea Date: Fri, 28 Jun 2019 19:14:25 +0800 Subject: [PATCH] test --- obj.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/obj.go b/obj.go index f31d741..ede945c 100644 --- a/obj.go +++ b/obj.go @@ -657,6 +657,7 @@ func silentGetObjItemID(code string, name string) int64 { item := ChatWarsItem{ ObjID64: 0, } + match := false cacheObjItem.Range(func(k, v interface{}) bool { item = v.(ChatWarsItem) if ok, _ := regexp.MatchString(`^(a|e|w)[0-9]+$`, item.Code); !ok { //only gear can be custom named @@ -665,6 +666,7 @@ func silentGetObjItemID(code string, name string) int64 { m := fmt.Sprintf("^((%s.*)|(.*%s))$", regexp.QuoteMeta(item.Name), regexp.QuoteMeta(item.Name)) if ok, _ := regexp.MatchString(m, basename); ok { log.Printf("LOOP : Matching item modified basename %s with %s (%d).\n", basename, item.Name, item.ObjID64) + match = true return false } else { log.Printf("Not matching item modified basename %s with %s (%d).\n", basename, item.Name, item.ObjID64) @@ -675,7 +677,7 @@ func silentGetObjItemID(code string, name string) int64 { } }) - if item.ObjID64 != 0 { + if item.ObjID64 != 0 && match { log.Printf("RETURN : Matching item modified basename %s with %s (%d).\n", basename, item.Name, item.ObjID64) return item.ObjID64 } else {