加入榨汁机 冰棍盒,炒冰盒 厨具架小bug

behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/chaoguo/service/ChaoguoService.py

@@ -372,27 +372,13 @@ class ChaoguoService(BlueFoxServerSystem):
     # ============================================================================
 
     def dropItem(self, dim, pos, itemName, count=1, aux=0, playerId=None):
-        """取成品/返容器: playerId 给出时【优先入包】—— 主手空->放主手;
-        否则入背包(同类叠加/空位); 背包满(返回False)->落回地面掉落物。
-        不传 playerId(无玩家上下文, 如破坏掉落) 保持原掉落物, 零影响。"""
+        """取成品/返容器: playerId 给出时走统一优先级(同类合并->主手->背包->掉落);
+        不传 playerId(无玩家上下文, 如破坏掉落) 保持原掉落物。"""
+        if playerId is not None:
+            self.giveItemToPlayer(playerId, itemName, count, pos, dim)
+            return
         try:
             itemDict = {"itemName": itemName, "count": count, "auxValue": aux}
-            if playerId is not None:
-                # 1) 主手空 -> 放主手
-                cur = self.getCarriedItem(playerId)
-                handItem = (cur or {}).get("newItemName")
-                if not handItem or handItem == "minecraft:air":
-                    try:
-                        if comp.CreateItem(playerId).SpawnItemToPlayerCarried(itemDict, playerId):
-                            return
-                    except Exception:
-                        pass
-                # 2) 否则入包(同类叠加/空位); 失败(满)->掉落
-                try:
-                    if comp.CreateItem(playerId).SpawnItemToPlayerInv(itemDict, playerId):
-                        return
-                except Exception:
-                    pass
             self.CreateEngineItemEntity(itemDict, dim, (pos[0], pos[1] + 0.5, pos[2]))
         except Exception:
             pass