mirrors/stevenarella
mirrors
/
stevenarella
mirror of https://github.com/iceiix/stevenarella.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Fix SpawnPainting parsing 1.13.2-1.14.4, closes #212 (#213) 

The packet changed in 1.13.2 but wasn't updated, so we split the packet
variants into SpawnPainting_String for the old version and
SpawnPainting_VarInt for the new version with a 'motive' VarInt field
instead of a String title.

1.9-1.12.2 SpawnPainting_String: https://wiki.vg/index.php?title=Protocol&oldid=14204#Spawn_Painting
1.13.2-1.14.4 SpawnPainting_VarInt: https://wiki.vg/index.php?title=Protocol&oldid=14889#Spawn_Painting
This commit is contained in:
iceiix 2019-08-17 13:36:07 -07:00 committed by GitHub
parent 40c7a64c45
commit 57da39bb79
14 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
protocol/src/protocol/packet.rs
View File

@ -619,7 +619,14 @@ state_packets!(
}
/// SpawnPainting spawns a painting into the world when it is in range of
/// the client. The title effects the size and the texture of the painting.
packet SpawnPainting {
packet SpawnPainting_VarInt {
field entity_id: VarInt =,
field uuid: UUID =,
field motive: VarInt =,
field location: Position =,
field direction: u8 =,
}
packet SpawnPainting_String {
field entity_id: VarInt =,
field uuid: UUID =,
field title: String =,

2
protocol/src/protocol/versions/v18w50a.rs
View File

@ -57,7 +57,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_String
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v19w02a.rs
View File

@ -57,7 +57,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_String
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_10_2.rs
View File

@ -44,7 +44,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob_u8
0x04 => SpawnPainting
0x04 => SpawnPainting_String
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_11_2.rs
View File

@ -44,7 +44,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_String
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_12_2.rs
View File

@ -47,7 +47,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_VarInt
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_13_2.rs
View File

@ -57,7 +57,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_VarInt
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_14.rs
View File

@ -60,7 +60,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_VarInt
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_14_1.rs
View File

@ -60,7 +60,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_VarInt
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_14_2.rs
View File

@ -60,7 +60,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_VarInt
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_14_3.rs
View File

@ -60,7 +60,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_VarInt
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_14_4.rs
View File

@ -60,7 +60,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob
0x04 => SpawnPainting
0x04 => SpawnPainting_VarInt
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_9.rs
View File

@ -44,7 +44,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob_u8
0x04 => SpawnPainting
0x04 => SpawnPainting_String
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics

2
protocol/src/protocol/versions/v1_9_2.rs
View File

@ -44,7 +44,7 @@ protocol_packet_ids!(
0x01 => SpawnExperienceOrb
0x02 => SpawnGlobalEntity
0x03 => SpawnMob_u8
0x04 => SpawnPainting
0x04 => SpawnPainting_String
0x05 => SpawnPlayer_f64
0x06 => Animation
0x07 => Statistics