From bf485f132c813cbbcfd5cc1bf89d94ffce3453a1 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Fri, 26 Sep 2025 15:50:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/PlayerFunc.go      | 4 ++--
 src/server/game/mod/order/Order.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go
index 9b07ee81..cb89a267 100644
--- a/src/server/game/PlayerFunc.go
+++ b/src/server/game/PlayerFunc.go
@@ -1066,9 +1066,9 @@ func (player *Player) AddOrder() {
 		ChessId := OrderMod.LastOrder.MergeId[0]
 		ChessColor := mergeDataCfg.GetColorById(ChessId)
 		PreheatStep := OrderMod.PreheatStep[ChessColor]
+		OrderMod.PreheatStep[ChessColor]++
 		if PreheatStep < 4 {
 			NewChessId := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+PreheatStep+1, ChessColor)
-			OrderMod.PreheatStep[ChessColor]++
 			Items, ok := order.PreheatItems[OrderMod.PreheatStep[ChessColor]]
 			if !ok {
 				Items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId}, ChessMod.GetOrderEmit()))}
@@ -1107,7 +1107,7 @@ func (player *Player) FixOrderBug() {
 
 		}
 		if Exit {
-			continue
+			//continue
 		}
 		NewChessId := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+v+1, k)
 		OrderMod.PreheatStep[k]++
diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go
index 26a49442..fdc7e595 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -656,7 +656,7 @@ func (o *OrderMod) ChangeEnergyMul(lv int, Emit []int, EnergyMul int, ChessList
 			delete(o.OrderList, k)
 			Items, ok := PreheatItems[PreheatStep]
 			if !ok {
-				Items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, GetOrderStar(ChessList, Emit))}
+				Items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, GetOrderStar([]int{NewChessId}, Emit))}
 			}
 			o.addPreheatOrder([]int{NewChessId}, DIFF_LOW, Preheat_type, Items)
 		}