zyl/classics
1
0
Fork 0
mirror of https://github.com/zyllian/classics.git synced 2025-01-18 11:47:14 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

make fluids flow through all non solid blocks, not just air

Browse source
This commit is contained in:
Zoey 2024-04-22 16:40:07 -07:00
parent 492da31ce0
commit c1eb4e1a8b
No known key found for this signature in database
GPG key ID: 8611B896D1AAFAF2
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/server.rs
View file

@ -107,14 +107,10 @@ fn tick(data: &mut ServerData, tick: usize) {
let mut packets = level.apply_updates(); let mut packets = level.apply_updates();
let awaiting_update = std::mem::take(&mut level.awaiting_update); let awaiting_update = std::mem::take(&mut level.awaiting_update);
if !awaiting_update.is_empty() {
println!("hm");
}
for index in awaiting_update { for index in awaiting_update {
let (x, y, z) = level.coordinates(index); let (x, y, z) = level.coordinates(index);
let block_id = level.get_block(x, y, z); let block_id = level.get_block(x, y, z);
let block = BLOCK_INFO.get(&block_id).expect("should never fail"); let block = BLOCK_INFO.get(&block_id).expect("should never fail");
println!("{block:#?}");
match &block.block_type { match &block.block_type {
BlockType::FluidFlowing { BlockType::FluidFlowing {
stationary, stationary,
@ -127,8 +123,10 @@ fn tick(data: &mut ServerData, tick: usize) {
}; };
level.updates.push(update); level.updates.push(update);
for (nx, ny, nz) in neighbors_minus_up(level, x, y, z) { for (nx, ny, nz) in neighbors_minus_up(level, x, y, z) {
let block_at = level.get_block(nx, ny, nz); let block_at = BLOCK_INFO
let update = if block_at == 0 { .get(&level.get_block(nx, ny, nz))
.expect("missing block");
let update = if matches!(block_at.block_type, BlockType::NonSolid) {
level.awaiting_update.insert(level.index(nx, ny, nz)); level.awaiting_update.insert(level.index(nx, ny, nz));
BlockUpdate { BlockUpdate {
index: level.index(nx, ny, nz), index: level.index(nx, ny, nz),
@ -146,7 +144,13 @@ fn tick(data: &mut ServerData, tick: usize) {
BlockType::FluidStationary { moving } => { BlockType::FluidStationary { moving } => {
let mut needs_update = false; let mut needs_update = false;
for (nx, ny, nz) in neighbors_minus_up(level, x, y, z) { for (nx, ny, nz) in neighbors_minus_up(level, x, y, z) {
if level.get_block(nx, ny, nz) == 0 { if matches!(
BLOCK_INFO
.get(&level.get_block(nx, ny, nz))
.expect("missing block")
.block_type,
BlockType::NonSolid
) {
needs_update = true; needs_update = true;
break; break;
} }