From eb065e198405d5692eb91d47d2ac66a625984b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=7E?= <158024940+xyy0411@users.noreply.github.com>
Date: Tue, 22 Oct 2024 00:15:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(niuniu):=20=E4=B8=80=E4=BA=9B=E5=B0=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#1043)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/niuniu/main.go  | 3 ++-
 plugin/niuniu/model.go | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugin/niuniu/main.go b/plugin/niuniu/main.go
index a9810e8bd2..d843b303f3 100644
--- a/plugin/niuniu/main.go
+++ b/plugin/niuniu/main.go
@@ -289,10 +289,10 @@ func init() {
 			dajiaoLimiter.Delete(fmt.Sprintf("%d_%d", gid, uid))
 			return
 		}
-
 		messages, err := niuniu.processNiuNiuAction(t, fiancee[1])
 		if err != nil {
 			ctx.SendChain(message.Text(err))
+			dajiaoLimiter.Delete(fmt.Sprintf("%d_%d", gid, uid))
 			return
 		}
 		if err = db.insertNiuNiu(&niuniu, gid); err != nil {
@@ -375,6 +375,7 @@ func init() {
 		fencingResult, err := myniuniu.processJJuAction(&adduserniuniu, t, fiancee[1])
 		if err != nil {
 			ctx.SendChain(message.Text(err))
+			jjLimiter.Delete(t)
 			return
 		}
 
diff --git a/plugin/niuniu/model.go b/plugin/niuniu/model.go
index 99d959769e..eb65ba608d 100644
--- a/plugin/niuniu/model.go
+++ b/plugin/niuniu/model.go
@@ -142,8 +142,8 @@ func (u *userInfo) processNiuNiuAction(t string, props string) (string, error) {
 	load, ok := prop.Load(t)
 	info = *u
 	if props != "" {
-		if !contains(t, dajiaoProp) {
-			return "", errors.New("道具不能混着用哦")
+		if contains(t, dajiaoProp) {
+			return "", errors.New("道具不存在")
 		}
 		if err = u.createUserInfoByProps(props); err != nil {
 			return "", err
@@ -221,8 +221,8 @@ func (u *userInfo) processJJuAction(adduserniuniu *userInfo, t string, props str
 	v, ok := prop.Load(t)
 	info = *u
 	if props != "" {
-		if !contains(t, jjProp) {
-			return "", errors.New("道具不能混着用哦")
+		if contains(t, jjProp) {
+			return "", errors.New("道具不存在")
 		}
 		if err = u.createUserInfoByProps(props); err != nil {
 			return "", err