From 4bb023b215485cd595cb7fd0d6588ed0fab8296a Mon Sep 17 00:00:00 2001 From: koskja <87826472+koskja@users.noreply.github.com> Date: Wed, 29 Dec 2021 18:12:51 +0100 Subject: [PATCH] Revert "Datapack parsing (#455)" This reverts commit 7e46ec7f5954a5a16f9426efdc1ee16c8cd2de2e. --- feather/common/Cargo.toml | 3 +-- feather/server/src/systems/player_join.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/feather/common/Cargo.toml b/feather/common/Cargo.toml index 03e42c348..b7bcce69a 100644 --- a/feather/common/Cargo.toml +++ b/feather/common/Cargo.toml @@ -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" \ No newline at end of file +vek = "0.14" diff --git a/feather/server/src/systems/player_join.rs b/feather/server/src/systems/player_join.rs index 51fcb2c5e..fef3e49a5 100644 --- a/feather/server/src/systems/player_join.rs +++ b/feather/server/src/systems/player_join.rs @@ -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