diff --git a/cron.go b/cron.go index 117b609..1a63be4 100644 --- a/cron.go +++ b/cron.go @@ -86,5 +86,13 @@ func cronGetHammerTime() { } func cronSaveClients() { + var clts []ChirpClient + muxClients.RLock() + for _, c := range clients { + if c.Active { + clts = append(clts, c) + } + } + muxClients.RUnLock() } diff --git a/msg.go b/msg.go index be202e1..1b7446b 100644 --- a/msg.go +++ b/msg.go @@ -354,11 +354,11 @@ func parseSubTypeMessageGRolesAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWa func parseSubTypeMessageGoQuestAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessageGoQuestAck, error) { cwm := ChatWarsMessageGoQuestAck{} - - log.Printf("parseSubTypeMessageGoQuestAck : Go Quest Ack report identified\n") - log.Printf("parseSubTypeMessageGoQuestAck : Place : %s\n", r.ReplaceAllString(m.Text, "${Place}")) - log.Printf("parseSubTypeMessageGoQuestAck : Time : %s\n", r.ReplaceAllString(m.Text, "${Time}")) - + /* + log.Printf("parseSubTypeMessageGoQuestAck : Go Quest Ack report identified\n") + log.Printf("parseSubTypeMessageGoQuestAck : Place : %s\n", r.ReplaceAllString(m.Text, "${Place}")) + log.Printf("parseSubTypeMessageGoQuestAck : Time : %s\n", r.ReplaceAllString(m.Text, "${Time}")) + */ switch quest := strings.ToLower(r.ReplaceAllString(m.Text, "${Place}")); quest { case "forest": cwm.QuestTypeID64 = cacheObjSubType[`quest_forest`] @@ -369,7 +369,7 @@ func parseSubTypeMessageGoQuestAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatW cwm.QuestTypeID64 = cacheObjSubType[`quest_forest`] } i, err := strconv.ParseInt(r.ReplaceAllString(m.Text, "${Time}"), 10, 64) - if err != nil { + if err == nil { cwm.Duration = time.Duration(i) * time.Minute } else { cwm.Duration = 0 * time.Minute