rebased

2021-06-20 01:00:38 +00:00 · 2021-06-20 01:00:38 +00:00 · 2debc015b7
commit 2debc015b7
parent e959fc3094 799a9e6880
1 changed files with 3 additions and 0 deletions
--- a/src/packet/messages.rs
+++ b/src/packet/messages.rs
@ -266,11 +266,14 @@ pub struct PlayerDonatedPB {
    recipient: u32,
 }

+<<<<<<< HEAD
 #[pso_message(0x37)]
 pub struct PlayerInitiatedPB {
    pb_amount: u8,
    unknown1: [u8; 4],
 }
+=======
+>>>>>>> 799a9e68804633c24b47b759c75269f7106918cc
 #[pso_message(0x39)]
 pub struct PlayerPBReady {
    player: u16,