Skip to content

Fix state change packet #525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Defman merged 1 commit into from
Jan 21, 2022
Merged

Fix state change packet #525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions feather/protocol/src/packets/server/play.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,13 @@ pub enum GameStateChange {
/// Seems to change both skycolor and lightning.
RainLevelChange {
/// Possible values are from 0 to 1
rain_level: f64,
rain_level: f32,
},
/// Seems to change both skycolor and lightning (same as Rain level change, but doesn't start rain).
/// It also requires rain to render by notchian client.
ThunderLevelChange {
/// Possible values are from 0 to 1
thunder_level: f64,
thunder_level: f32,
},
PlayPufferfishStingSound,
PlayElderGuardianAppearance,
Expand Down Expand Up @@ -423,16 +423,16 @@ impl Writeable for GameStateChange {

// Value
match self {
GameStateChange::ChangeGamemode { gamemode } => *gamemode as u8 as f64,
GameStateChange::WinGame { show_credits } => *show_credits as u8 as f64,
GameStateChange::ChangeGamemode { gamemode } => *gamemode as u8 as f32,
GameStateChange::WinGame { show_credits } => *show_credits as u8 as f32,
GameStateChange::DemoEvent(DemoEventType::ShowWelcomeToDemoScreen) => 0.0,
GameStateChange::DemoEvent(DemoEventType::TellMovementControls) => 101.0,
GameStateChange::DemoEvent(DemoEventType::TellJumpControl) => 102.0,
GameStateChange::DemoEvent(DemoEventType::TellInventoryControl) => 103.0,
GameStateChange::DemoEvent(DemoEventType::TellDemoIsOver) => 104.0,
GameStateChange::RainLevelChange { rain_level } => *rain_level,
GameStateChange::ThunderLevelChange { thunder_level } => *thunder_level,
GameStateChange::EnableRespawnScreen { enable } => !enable as u8 as f64,
GameStateChange::EnableRespawnScreen { enable } => !enable as u8 as f32,
_ => 0.0,
}
.write(buffer, version)?;
Expand All @@ -447,7 +447,7 @@ impl Readable for GameStateChange {
Self: Sized,
{
let reason = u8::read(buffer, version)?;
let value = f64::read(buffer, version)?;
let value = f32::read(buffer, version)?;
Ok(match reason {
0 => GameStateChange::SendNoRespawnBlockAvailableMessage,
1 => GameStateChange::EndRaining,
Expand Down