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 'zesterer/small-fixes' into 'master'

Browse Source 
Prevented towns destroying trees, rocks, other towns, etc.

See merge request veloren/veloren!1611
This commit is contained in:
Marcel 2020-12-11 20:33:58 +00:00
commit e438b4f85f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
world/src/site/settlement/mod.rs
View File

@ -747,7 +747,16 @@ impl Settlement {
},
);
} else if z >= 0 {
if block.kind() != BlockKind::Water {
if [
BlockKind::Air,
BlockKind::Grass,
BlockKind::Earth,
BlockKind::Sand,
BlockKind::Snow,
BlockKind::Rock,
]
.contains(&block.kind())
{
let _ = vol.set(pos, Block::air(SpriteKind::Empty));
}
} else {