Fix trading, quest, and player info packets

sorokya · Aug 21, 2024 · 2d6219d · 2d6219d
1 parent 40d362a
commit 2d6219d
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 32 deletions.
diff --git a/src/map/map/quest/reply_to_quest_npc.rs b/src/map/map/quest/reply_to_quest_npc.rs
@@ -195,7 +195,7 @@ impl Map {
 
         if !messages.is_empty() {
             let packet = QuestReportServerPacket {
-                npc_id: npc_index,
+                npc_index,
                 messages,
             };
 

diff --git a/src/map/map/quest/talk_to_quest_npc.rs b/src/map/map/quest/talk_to_quest_npc.rs
@@ -187,7 +187,7 @@ impl Map {
 
         if !messages.is_empty() {
             let packet = QuestReportServerPacket {
-                npc_id: npc_index,
+                npc_index,
                 messages,
             };
 

diff --git a/src/map/map/trade/complete_trade.rs b/src/map/map/trade/complete_trade.rs
@@ -92,12 +92,16 @@ impl Map {
                 PacketAction::Use,
                 PacketFamily::Trade,
                 &TradeUseServerPacket {
-                    trade_data: TradeItemData {
-                        partner_player_id: partner_id,
-                        partner_items: partner_trade_items.clone(),
-                        your_player_id: player_id,
-                        your_items: trade_items.clone(),
-                    },
+                    trade_data: [
+                        TradeItemData {
+                            player_id: partner_id,
+                            items: partner_trade_items.clone(),
+                        },
+                        TradeItemData {
+                            player_id,
+                            items: trade_items.clone(),
+                        },
+                    ],
                 },
             );
         }
@@ -110,12 +114,16 @@ impl Map {
                 PacketAction::Use,
                 PacketFamily::Trade,
                 &TradeUseServerPacket {
-                    trade_data: TradeItemData {
-                        partner_player_id: player_id,
-                        partner_items: trade_items.clone(),
-                        your_player_id: partner_id,
-                        your_items: partner_trade_items.clone(),
-                    },
+                    trade_data: [
+                        TradeItemData {
+                            player_id,
+                            items: trade_items.clone(),
+                        },
+                        TradeItemData {
+                            player_id: partner_id,
+                            items: partner_trade_items.clone(),
+                        },
+                    ],
                 },
             );
         }

diff --git a/src/map/map/trade/send_trade_update.rs b/src/map/map/trade/send_trade_update.rs
@@ -37,12 +37,16 @@ impl Map {
                 PacketAction::Reply,
                 PacketFamily::Trade,
                 &TradeReplyServerPacket {
-                    trade_data: TradeItemData {
-                        partner_player_id: partner_id,
-                        partner_items: partner_items.to_owned(),
-                        your_player_id: player_id,
-                        your_items: your_items.to_owned(),
-                    },
+                    trade_data: [
+                        TradeItemData {
+                            player_id: partner_id,
+                            items: partner_items.to_owned(),
+                        },
+                        TradeItemData {
+                            player_id,
+                            items: your_items.to_owned(),
+                        },
+                    ],
                 },
             );
 
@@ -52,25 +56,33 @@ impl Map {
                     PacketAction::Admin,
                     PacketFamily::Trade,
                     &TradeAdminServerPacket {
-                        trade_data: TradeItemData {
-                            partner_player_id: player_id,
-                            partner_items: your_items,
-                            your_player_id: partner_id,
-                            your_items: partner_items,
-                        },
+                        trade_data: [
+                            TradeItemData {
+                                player_id,
+                                items: your_items,
+                            },
+                            TradeItemData {
+                                player_id: partner_id,
+                                items: partner_items,
+                            },
+                        ],
                     },
                 );
             } else {
                 partner.send(
                     PacketAction::Reply,
                     PacketFamily::Trade,
                     &TradeReplyServerPacket {
-                        trade_data: TradeItemData {
-                            partner_player_id: player_id,
-                            partner_items: your_items,
-                            your_player_id: partner_id,
-                            your_items: partner_items,
-                        },
+                        trade_data: [
+                            TradeItemData {
+                                player_id,
+                                items: your_items,
+                            },
+                            TradeItemData {
+                                player_id: partner_id,
+                                items: partner_items,
+                            },
+                        ],
                     },
                 );
             }

diff --git a/src/world/world/admin/request_player_info.rs b/src/world/world/admin/request_player_info.rs
@@ -70,6 +70,7 @@ impl World {
                         },
                         elemental_stats: CharacterElementalStats::default(),
                     },
+                    gold_bank: character.gold_bank,
                     weight: character.get_weight(),
                 },
             );