Skip to content

Commit

Permalink
Revert "Datapack parsing (feather-rs#455)"
Browse files Browse the repository at this point in the history
This reverts commit 7e46ec7.
  • Loading branch information
koskja committed Dec 29, 2021
1 parent 19cd980 commit 4bb023b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions feather/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ uuid = { version = "0.8", features = [ "v4" ] }
libcraft-core = { path = "../../libcraft/core" }
rayon = "1.5"
worldgen = { path = "../worldgen", package = "feather-worldgen" }
datapacks = { path = "../datapacks", package = "feather-datapacks" }
rand = "0.8"
vek = "0.14"
vek = "0.14"
2 changes: 1 addition & 1 deletion feather/server/src/systems/player_join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ fn accept_new_player(game: &mut Game, server: &mut Server, client_id: ClientId)
.add(ChatBox::new(ChatPreference::All))
.add(inventory)
.add(window)
.add(EntityKind::Player);
.add(EntityKind::Player)
.add(hotbar_slot)
.add(Health(
player_data
Expand Down

0 comments on commit 4bb023b

Please sign in to comment.