From 400cf2c18b6d6611c7df8e6fa2934f73b67ae063 Mon Sep 17 00:00:00 2001 From: iceiix <43691553+iceiix@users.noreply.github.com> Date: Sat, 1 Dec 2018 10:10:48 -0800 Subject: [PATCH] 1.11.2 (316) protocol update (#38) Only a minor update, -1 now indicates no color, so changed u8 to i8: https://wiki.vg/Protocol_History#16w50a https://wiki.vg/index.php?title=Protocol&diff=8543&oldid=8405 https://wiki.vg/index.php?title=Protocol&oldid=8543 and updated version numbers. 1.11.2 uses the same 1.11 assets, which can be found by looking up 1.11.2 in: https://launchermeta.mojang.com/mc/game/version_manifest.json https://launchermeta.mojang.com/v1/packages/6bd228727ed48bd7ac7bdc0088587dad0fb7c02b/1.11.2.json 1.11.2/1.11 is compatible except for the version number, which is now sent matching the server (#20), so no backwards-compatible branch for 1.11 (315) is needed. https://github.com/iceiix/steven/issues/18 Enhance protocol support --- protocol/src/protocol/mod.rs | 2 +- protocol/src/protocol/packet.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/protocol/src/protocol/mod.rs b/protocol/src/protocol/mod.rs index 65add2c..7a61b26 100644 --- a/protocol/src/protocol/mod.rs +++ b/protocol/src/protocol/mod.rs @@ -36,7 +36,7 @@ use flate2::Compression; use std::time::{Instant, Duration}; use crate::shared::Position; -pub const SUPPORTED_PROTOCOL: i32 = 315; +pub const SUPPORTED_PROTOCOL: i32 = 316; /// Helper macro for defining packets diff --git a/protocol/src/protocol/packet.rs b/protocol/src/protocol/packet.rs index b491cd0..dc6dcca 100644 --- a/protocol/src/protocol/packet.rs +++ b/protocol/src/protocol/packet.rs @@ -751,7 +751,7 @@ state_packets!( field flags: Option = when(|p: &Teams| p.mode == 0 || p.mode == 2), field name_tag_visibility: Option = when(|p: &Teams| p.mode == 0 || p.mode == 2), field collision_rule: Option = when(|p: &Teams| p.mode == 0 || p.mode == 2), - field color: Option = when(|p: &Teams| p.mode == 0 || p.mode == 2), + field color: Option = when(|p: &Teams| p.mode == 0 || p.mode == 2), field players: Option> = when(|p: &Teams| p.mode == 0 || p.mode == 3 || p.mode == 4), } /// UpdateScore is used to update or remove an item from a scoreboard