From 34a15d1bf8784dc22f4a788707c1be26f2992f57 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 30 Jun 2021 18:18:13 +0100
Subject: [PATCH] sync

---
 common/net/src/msg/compression.rs | 2 +-
 world/src/canvas.rs               | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/net/src/msg/compression.rs b/common/net/src/msg/compression.rs
index b4f2078ef3..da92e3805c 100644
--- a/common/net/src/msg/compression.rs
+++ b/common/net/src/msg/compression.rs
@@ -557,7 +557,7 @@ impl<const AVERAGE_PALETTE: bool> VoxelImageDecoding for TriPngEncoding<AVERAGE_
                 } else {
                     use BlockKind::*;
                     match kind {
-                        Air | Water | Lava | GlowingRock => Rgb { r: 0, g: 0, b: 0 },
+                        Air | Water | Lava => Rgb { r: 0, g: 0, b: 0 },
                         Rock => Rgb {
                             r: 93,
                             g: 110,
diff --git a/world/src/canvas.rs b/world/src/canvas.rs
index b264729656..063a9fa6eb 100644
--- a/world/src/canvas.rs
+++ b/world/src/canvas.rs
@@ -110,9 +110,11 @@ impl<'a> CanvasInfo<'a> {
             cave: Default::default(),
             cliff_height: 0.0,
             contains_waypoint: false,
+            spot: None,
         };
         f(&CanvasInfo {
-            wpos: Vec2::broadcast(0),
+            chunk_pos: Vec2::zero(),
+            wpos: Vec2::zero(),
             column_grid: &zcache_grid,
             column_grid_border: 0,
             chunks: &sim,