稻谷bug修复 提示删除

behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/jiaju/service/FurnitureService.py

@@ -317,10 +317,6 @@ class FurnitureService(BlueFoxServerSystem):
             # 保存记录到新方块（延迟兜底）
             self._saveRecordDelayed(pos, dim, record)
 
-            if recipe.get("tip"):
-                comp.CreateMsg(playerId).NotifyOneMessage(
-                    playerId, "§a存入了 %d 只箭 (共%d/32)" % (storeCount, record["count"]))
-
         elif mode == "retrieve":
             # ---- 取箭 ----
             record = self._loadRecord(pos, dim)
@@ -330,9 +326,11 @@ class FurnitureService(BlueFoxServerSystem):
             retCount = record["count"]
             retItemName = record["itemName"]
             retAux = record.get("aux", 0)
+            retUserData = record.get("userData")
 
-            # 掉落物形式返回箭(根因C)
-            self._dropItemDict(dim, pos, {"itemName": retItemName, "count": retCount, "auxValue": retAux})
+            # 掉落物形式返回箭(根因C); 药水箭带 userData 还原药水效果
+            self._dropItemDict(dim, pos, {"itemName": retItemName, "count": retCount,
+                                          "aux": retAux, "userData": retUserData})
 
             # 替换方块
             if recipe.get("target"):
@@ -341,10 +339,6 @@ class FurnitureService(BlueFoxServerSystem):
             # 清空记录
             self._clearRecord(pos, dim)
 
-            if recipe.get("tip"):
-                comp.CreateMsg(playerId).NotifyOneMessage(
-                    playerId, "§a取回了 %d 只箭" % retCount)
-
     # ============================================================================
     # 四、厨具架通用逻辑（组合由 stack 记录计算, 与放入顺序无关, 取回后放先取）
     # ============================================================================
@@ -382,7 +376,6 @@ class FurnitureService(BlueFoxServerSystem):
                 self._saveRecordDelayed(pos, dim, {"stack": self._namesToObjs(stackNames)})
             else:
                 self._clearRecord(pos, dim)
-            comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a取回了厨具")
             return
 
         # ---- 放入: 手持厨具 ----
@@ -402,7 +395,6 @@ class FurnitureService(BlueFoxServerSystem):
         stackNames.append(itemName)
         self.replaceBlock(pos, dim, target, playerId)
         self._saveRecordDelayed(pos, dim, {"stack": self._namesToObjs(stackNames)})
-        comp.CreateMsg(playerId).NotifyOneMessage(playerId, "§a放上了厨具")
 
     def _rackTarget(self, itemNames):
         """根据厨具物品名列表计算厨具架目标方块(0件=空, 1件=单件, 2件=组合, 顺序无关)"""
@@ -488,10 +480,6 @@ class FurnitureService(BlueFoxServerSystem):
                 self._dropItemDict(dim, pos,
                                    {"itemName": _gItem, "count": recipe.get("giveCount", 1), "auxValue": 0})
 
-        # ---- 转换成功提示 ----
-        if recipe.get("tip"):
-            comp.CreateMsg(playerId).NotifyOneMessage(playerId, recipe["tip"])
-
     # ============================================================================
     # 五、方块记录：count/stack 读写（箭桶/书柜, 字段 rtdd_sw*）
     # ============================================================================
@@ -669,13 +657,16 @@ class FurnitureService(BlueFoxServerSystem):
             pass
 
     def _dropItemDict(self, dim, pos, itemDict):
-        """以掉落物形式生成一个物品（唱片取回）"""
+        """以掉落物形式生成一个物品（唱片取回 / 箭桶取回等）"""
         try:
-            self.CreateEngineItemEntity(
-                {"itemName": itemDict["itemName"],
-                 "count": 1,
-                 "auxValue": itemDict.get("aux", 0)},
-                dim, (pos[0], pos[1] + 0.5, pos[2]))
+            outDict = {"itemName": itemDict["itemName"],
+                       "count": itemDict.get("count", 1),
+                       # 兼容两种 key: 调用处既有用 aux 也有用 auxValue
+                       "auxValue": itemDict.get("aux", itemDict.get("auxValue", 0))}
+            # 药水箭等带 userData(item额外数据, 如药水NBT)的物品: 一并重建到掉落物
+            if itemDict.get("userData"):
+                outDict["userData"] = itemDict["userData"]
+            self.CreateEngineItemEntity(outDict, dim, (pos[0], pos[1] + 0.5, pos[2]))
         except Exception:
             pass