From 3dda192a6f2efac3cf9e372302049fc43b0a9733 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Fri, 20 Mar 2026 15:46:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E6=89=93?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/player_data.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go
index 7787f504..e67560bb 100644
--- a/src/server/game/player_data.go
+++ b/src/server/game/player_data.go
@@ -641,6 +641,9 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 		switch IType {
 		case item.ITEM_TYPE_ENERGY: // 能量
 			err := p.GetPlayerBaseMod().AddEnergy(p, v.Num)
+			if err != nil {
+				return err
+			}
 			p.TeLog("asset_change", map[string]interface{}{
 				"item_id":       v.Id,
 				"change_type":   change_type,
@@ -649,15 +652,13 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 				"change_reason": Label,
 			})
 			is_update = true
-			if err != nil {
-				return err
-			}
+
 		case item.ITEM_TYPE_STAR: // 星星
 			err := p.GetPlayerBaseMod().AddStar(p, v.Num)
-			is_update = true
 			if err != nil {
 				return err
 			}
+			is_update = true
 			p.TeLog("asset_change", map[string]interface{}{
 				"item_id":       v.Id,
 				"change_type":   change_type,
@@ -667,10 +668,10 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 			})
 		case item.ITEM_TYPE_DIAMOND: // 钻石
 			err := p.GetPlayerBaseMod().AddDiamond(v.Num)
-			is_update = true
 			if err != nil {
 				return err
 			}
+			is_update = true
 			if v.Num < 0 {
 				p.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_DIAMOND, A: []interface{}{-v.Num}})
 			}
@@ -929,6 +930,9 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 			BackDataType[item.ITEM_TYPE_AD_CARD] = struct{}{}
 		default:
 			err := ItemMod.AddItem(v.Id, v.Num)
+			if err != nil {
+				return err
+			}
 			p.TeLog("asset_change", map[string]interface{}{
 				"item_id":       v.Id,
 				"change_type":   change_type,
@@ -948,9 +952,6 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
 					"event_id":   aId,
 				})
 			}
-			if err != nil {
-				return err
-			}
 		}
 	}
 	ResItemPopId := 0