From 3afcbdf2eb0d3727070fafb49c0354856ba2e893 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 4 Mar 2026 14:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=BA=97=E6=A3=8B?=
 =?UTF-8?q?=E5=AD=90=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/mod/charge/Charge.go    | 1 -
 src/server/game/mod/order/order_func.go | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go
index 6c793f51..25e280d7 100644
--- a/src/server/game/mod/charge/Charge.go
+++ b/src/server/game/mod/charge/Charge.go
@@ -313,7 +313,6 @@ func (c *ChargeMod) InitChessShop(Emit []int) {
 			if len(ChessList) == 1 {
 				ChessList = append(ChessList, ChessList[0]-1)
 			}
-			//ColorType := mergeDataCfg.GetColorType(p)
 			for _, c := range ChessList {
 				if c == 0 {
 					continue
diff --git a/src/server/game/mod/order/order_func.go b/src/server/game/mod/order/order_func.go
index 8b5280ab..45955ffe 100644
--- a/src/server/game/mod/order/order_func.go
+++ b/src/server/game/mod/order/order_func.go
@@ -669,6 +669,9 @@ func GetChessByDiff(EmitId, EnergyMul, Diff int, Color string) []int {
 		MaxLev := mergeDataCfg.GetMaxLvByColor(Color)
 		NewLev1 = min(NewLev1, MaxLev)
 		ChessId := mergeDataCfg.GetChessIdByLvAndColor(NewLev1, Color)
+		if ChessId == 0 {
+			continue
+		}
 		ChessIds = append(ChessIds, ChessId)
 	}
 	return GoUtil.UniqueInts(ChessIds)