From 7f08377001043812acc88ecf85b1f735aa3e3aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Korg=C3=B3l?= <kpiotr2005@gmail.com>
Date: Tue, 2 Jul 2019 20:52:44 +0200
Subject: [PATCH] Sync CanBuild component, fix /build messages

---
 common/src/comp/inputs.rs    | 2 +-
 common/src/msg/ecs_packet.rs | 2 ++
 common/src/state.rs          | 2 +-
 server/src/cmd.rs            | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/src/comp/inputs.rs b/common/src/comp/inputs.rs
index 104e52187d..576d23c490 100644
--- a/common/src/comp/inputs.rs
+++ b/common/src/comp/inputs.rs
@@ -89,7 +89,7 @@ impl Component for OnGround {
 }
 
 impl Component for CanBuild {
-    type Storage = NullStorage<Self>;
+    type Storage = FlaggedStorage<Self, NullStorage<Self>>;
 }
 
 impl Component for Jumping {
diff --git a/common/src/msg/ecs_packet.rs b/common/src/msg/ecs_packet.rs
index 76557b2e73..d1d7d25dae 100644
--- a/common/src/msg/ecs_packet.rs
+++ b/common/src/msg/ecs_packet.rs
@@ -22,6 +22,7 @@ sphynx::sum_type! {
         Ori(comp::Ori),
         Body(comp::Body),
         Player(comp::Player),
+        CanBuild(comp::CanBuild),
         Stats(comp::Stats),
     }
 }
@@ -35,6 +36,7 @@ sphynx::sum_type! {
         Ori(PhantomData<comp::Ori>),
         Body(PhantomData<comp::Body>),
         Player(PhantomData<comp::Player>),
+        CanBuild(PhantomData<comp::CanBuild>),
         Stats(PhantomData<comp::Stats>),
     }
 }
diff --git a/common/src/state.rs b/common/src/state.rs
index 943875a039..82ceadeed9 100644
--- a/common/src/state.rs
+++ b/common/src/state.rs
@@ -129,6 +129,7 @@ impl State {
         ecs.register_synced::<comp::Body>();
         ecs.register_synced::<comp::Player>();
         ecs.register_synced::<comp::Stats>();
+        ecs.register_synced::<comp::CanBuild>();
 
         // Register components synced by other means
         ecs.register::<comp::Pos>();
@@ -136,7 +137,6 @@ impl State {
         ecs.register::<comp::Ori>();
         ecs.register::<comp::MoveDir>();
         ecs.register::<comp::OnGround>();
-        ecs.register::<comp::CanBuild>();
         ecs.register::<comp::Controller>();
         ecs.register::<comp::Attacking>();
         ecs.register::<comp::Wielding>();
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 9565d80c38..557858aad1 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -413,7 +413,7 @@ fn handle_build(server: &mut Server, entity: EcsEntity, _args: String, _action:
                 .remove(entity);
             server.clients.notify(
                 entity,
-                ServerMsg::Chat(String::from("Toggled on build mode!")),
+                ServerMsg::Chat(String::from("Toggled off build mode!")),
             );
         }
         None => {
@@ -424,7 +424,7 @@ fn handle_build(server: &mut Server, entity: EcsEntity, _args: String, _action:
                 .insert(entity, comp::CanBuild);
             server.clients.notify(
                 entity,
-                ServerMsg::Chat(String::from("Toggled off build mode!")),
+                ServerMsg::Chat(String::from("Toggled on build mode!")),
             );
         }
     }