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

Merge branch 'attack' into 'master'

Browse Source 
Attack fixes

See merge request veloren/veloren!179

Former-commit-id: 97f1e109dcbcbf7f1d860cf3aebae871f93884cf
This commit is contained in:
Timo Koesters
2019-05-26 16:07:08 +00:00
parent 3393d16ce7 0fa701b086
commit cca5682c22
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/lib.rs
View File

@ -215,6 +215,8 @@ impl Server {
for entity in todo_kill { for entity in todo_kill {
if let Some(client) = self.clients.get_mut(&entity) { if let Some(client) = self.clients.get_mut(&entity) {
self.state
.write_component(entity, comp::phys::Vel(Vec3::zero()));
client.force_state(ClientState::Dead); client.force_state(ClientState::Dead);
} else { } else {
self.state.ecs_mut().delete_entity_synced(entity); self.state.ecs_mut().delete_entity_synced(entity);

17
voxygen/src/scene/figure.rs
View File

@ -585,21 +585,6 @@ impl FigureMgr {
}; };
state.skeleton.interpolate(&target_skeleton); state.skeleton.interpolate(&target_skeleton);
// Change in health as color!
let col = stats
.and_then(|stats| stats.hp.last_change)
.map(|(change_by, change_time)| Rgba::new(1.0, 0.7, 0.7, 1.0))
.unwrap_or(Rgba::broadcast(1.0));
// Change in health as color!
let col = stats
.and_then(|stats| stats.hp.last_change)
.map(|(change_by, change_time)| Rgba::new(1.0, 0.7, 0.7, 1.0))
.unwrap_or(Rgba::broadcast(1.0));
state.update(renderer, pos.0, dir.0, col);
state.update(renderer, pos.0, dir.0, col); state.update(renderer, pos.0, dir.0, col);
} }
}, },
@ -633,7 +618,7 @@ impl FigureMgr {
.join() .join()
{ {
if stat.is_dead() { if stat.is_dead() {
return; continue;
} }
match actor { match actor {