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

Make Combo also only sync for the client's entity

Browse Source
This commit is contained in:
Imbris 2022-01-17 00:27:27 -05:00
parent aa122c1a18
commit b19f780d9f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/net/src/synced_components.rs
View File

@ -40,12 +40,10 @@ macro_rules! synced_components {
shockwave: Shockwave,
beam_segment: BeamSegment,
alignment: Alignment,
// TODO: evaluate if this can be `FromClient`
combo: Combo,
// TODO: evaluate if this is used on the client,
// and if so what it is used for
player: Player,
// TODO: change this to FromClient and sync the bare minimum
// TODO: change this to `SyncFrom::ClientEntity` and sync the bare minimum
// from other entities (e.g. just keys needed to show appearance
// based on their loadout). Also, it looks like this actually has
// an alternative sync method implemented in entity_sync via
@ -55,6 +53,7 @@ macro_rules! synced_components {
// Synced to the client only for its own entity
combo: Combo,
skill_set: SkillSet,
active_abilities: ActiveAbilities,
can_build: CanBuild,
@ -186,10 +185,6 @@ impl NetSync for Alignment {
const SYNC_FROM: SyncFrom = SyncFrom::AllEntities;
}
impl NetSync for Combo {
const SYNC_FROM: SyncFrom = SyncFrom::AllEntities;
}
impl NetSync for Player {
const SYNC_FROM: SyncFrom = SyncFrom::AllEntities;
}
@ -198,6 +193,12 @@ impl NetSync for Inventory {
const SYNC_FROM: SyncFrom = SyncFrom::AllEntities;
}
// SyncFrom::ClientEntity
impl NetSync for Combo {
const SYNC_FROM: SyncFrom = SyncFrom::ClientEntity;
}
impl NetSync for SkillSet {
const SYNC_FROM: SyncFrom = SyncFrom::ClientEntity;
}