Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync CanBuild component, fix /build messages

Browse Source
This commit is contained in:
Piotr Korgól
2019-07-02 20:52:44 +02:00
parent bf748ae742
commit 7f08377001
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/comp/inputs.rs
View File

@ -89,7 +89,7 @@ impl Component for OnGround {
} }
impl Component for CanBuild { impl Component for CanBuild {
type Storage = NullStorage<Self>; type Storage = FlaggedStorage<Self, NullStorage<Self>>;
} }
impl Component for Jumping { impl Component for Jumping {

2
common/src/msg/ecs_packet.rs
View File

@ -22,6 +22,7 @@ sphynx::sum_type! {
Ori(comp::Ori), Ori(comp::Ori),
Body(comp::Body), Body(comp::Body),
Player(comp::Player), Player(comp::Player),
CanBuild(comp::CanBuild),
Stats(comp::Stats), Stats(comp::Stats),
} }
} }
@ -35,6 +36,7 @@ sphynx::sum_type! {
Ori(PhantomData<comp::Ori>), Ori(PhantomData<comp::Ori>),
Body(PhantomData<comp::Body>), Body(PhantomData<comp::Body>),
Player(PhantomData<comp::Player>), Player(PhantomData<comp::Player>),
CanBuild(PhantomData<comp::CanBuild>),
Stats(PhantomData<comp::Stats>), Stats(PhantomData<comp::Stats>),
} }
} }

2
common/src/state.rs
View File

@ -129,6 +129,7 @@ impl State {
ecs.register_synced::<comp::Body>(); ecs.register_synced::<comp::Body>();
ecs.register_synced::<comp::Player>(); ecs.register_synced::<comp::Player>();
ecs.register_synced::<comp::Stats>(); ecs.register_synced::<comp::Stats>();
ecs.register_synced::<comp::CanBuild>();
// Register components synced by other means // Register components synced by other means
ecs.register::<comp::Pos>(); ecs.register::<comp::Pos>();
@ -136,7 +137,6 @@ impl State {
ecs.register::<comp::Ori>(); ecs.register::<comp::Ori>();
ecs.register::<comp::MoveDir>(); ecs.register::<comp::MoveDir>();
ecs.register::<comp::OnGround>(); ecs.register::<comp::OnGround>();
ecs.register::<comp::CanBuild>();
ecs.register::<comp::Controller>(); ecs.register::<comp::Controller>();
ecs.register::<comp::Attacking>(); ecs.register::<comp::Attacking>();
ecs.register::<comp::Wielding>(); ecs.register::<comp::Wielding>();

4
server/src/cmd.rs
View File

@ -413,7 +413,7 @@ fn handle_build(server: &mut Server, entity: EcsEntity, _args: String, _action:
.remove(entity); .remove(entity);
server.clients.notify( server.clients.notify(
entity, entity,
ServerMsg::Chat(String::from("Toggled on build mode!")), ServerMsg::Chat(String::from("Toggled off build mode!")),
); );
} }
None => { None => {
@ -424,7 +424,7 @@ fn handle_build(server: &mut Server, entity: EcsEntity, _args: String, _action:
.insert(entity, comp::CanBuild); .insert(entity, comp::CanBuild);
server.clients.notify( server.clients.notify(
entity, entity,
ServerMsg::Chat(String::from("Toggled off build mode!")), ServerMsg::Chat(String::from("Toggled on build mode!")),
); );
} }
} }