Skip to content

Commit bc78067

Browse files
committed
Please formatter and clippy
1 parent c36fe98 commit bc78067

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

feather/common/src/block_break.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use base::{ItemStack, ValidBlockPosition};
1+
use base::{BlockKind, ItemStack, ValidBlockPosition};
22
use ecs::{EntityBuilder, SysResult, SystemExecutor};
33
use libcraft_items::EnchantmentKind;
44
use quill_common::{entities::Player, entity_init::EntityInit};
@@ -141,7 +141,7 @@ impl ActiveBreaker {
141141
equipped_item: Option<&ItemStack>,
142142
) -> Option<Self> {
143143
let block = world.block_at(block_pos)?.kind();
144-
if !block.diggable() {
144+
if !block.diggable() || block == BlockKind::Air {
145145
return None;
146146
}
147147
let harvestable = match (block.harvest_tools(), equipped_item) {
@@ -233,11 +233,10 @@ fn process_block_breaking(game: &mut Game) -> SysResult {
233233
update_queue.push(entity);
234234
}
235235
// Break block when client requests to finish in order to prevent desyncs
236-
if break_block {
237-
if breaker.finished().unwrap().fake_finished || !game.ecs.get::<Player>(entity).is_ok()
238-
{
239-
break_queue.push(entity);
240-
}
236+
if break_block && breaker.finished().unwrap().fake_finished
237+
|| game.ecs.get::<Player>(entity).is_err()
238+
{
239+
break_queue.push(entity);
241240
}
242241
}
243242
for entity in update_queue {
@@ -249,7 +248,12 @@ fn process_block_breaking(game: &mut Game) -> SysResult {
249248
game.ecs.insert_entity_event(entity, event)?;
250249
}
251250
for entity in break_queue.into_iter() {
252-
let breaker = game.ecs.get::<BlockBreaker>(entity)?.finished().unwrap().clone();
251+
let breaker = game
252+
.ecs
253+
.get::<BlockBreaker>(entity)?
254+
.finished()
255+
.unwrap()
256+
.clone();
253257
breaker.break_block(game)?;
254258
}
255259
Ok(())

feather/server/src/systems/player_join.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fn accept_new_player(game: &mut Game, server: &mut Server, client_id: ClientId)
109109
Position::default().chunk(),
110110
server.options.view_distance,
111111
))
112-
.add(Gamemode::Survival)
112+
.add(Gamemode::Creative)
113113
.add(previous_gamemode)
114114
.add(Name::new(client.username()))
115115
.add(client.uuid())

0 commit comments

Comments
 (0)