diff --git a/Cargo.lock b/Cargo.lock
index 10416a5..5ac63c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -115,9 +115,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.95"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
 
 [[package]]
 name = "arrayvec"
@@ -204,7 +204,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 [[package]]
 name = "azalea"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-auth",
  "azalea-block",
@@ -242,7 +242,7 @@ dependencies = [
 [[package]]
 name = "azalea-auth"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-buf",
  "azalea-crypto",
@@ -262,7 +262,7 @@ dependencies = [
 [[package]]
 name = "azalea-block"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-block-macros",
  "azalea-buf",
@@ -272,7 +272,7 @@ dependencies = [
 [[package]]
 name = "azalea-block-macros"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -282,7 +282,7 @@ dependencies = [
 [[package]]
 name = "azalea-brigadier"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-buf",
  "azalea-chat",
@@ -292,7 +292,7 @@ dependencies = [
 [[package]]
 name = "azalea-buf"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-buf-macros",
  "byteorder",
@@ -306,7 +306,7 @@ dependencies = [
 [[package]]
 name = "azalea-buf-macros"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -316,7 +316,7 @@ dependencies = [
 [[package]]
 name = "azalea-chat"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-buf",
  "azalea-language",
@@ -330,7 +330,7 @@ dependencies = [
 [[package]]
 name = "azalea-client"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-auth",
  "azalea-block",
@@ -364,7 +364,7 @@ dependencies = [
 [[package]]
 name = "azalea-core"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-buf",
  "azalea-chat",
@@ -381,7 +381,7 @@ dependencies = [
 [[package]]
 name = "azalea-crypto"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "aes",
  "azalea-buf",
@@ -398,7 +398,7 @@ dependencies = [
 [[package]]
 name = "azalea-entity"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-block",
  "azalea-buf",
@@ -422,7 +422,7 @@ dependencies = [
 [[package]]
 name = "azalea-inventory"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-buf",
  "azalea-chat",
@@ -431,13 +431,14 @@ dependencies = [
  "azalea-registry",
  "indexmap",
  "simdnbt",
+ "tracing",
  "uuid",
 ]
 
 [[package]]
 name = "azalea-inventory-macros"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -447,7 +448,7 @@ dependencies = [
 [[package]]
 name = "azalea-language"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "serde",
  "serde_json",
@@ -456,7 +457,7 @@ dependencies = [
 [[package]]
 name = "azalea-physics"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-block",
  "azalea-core",
@@ -473,7 +474,7 @@ dependencies = [
 [[package]]
 name = "azalea-protocol"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "async-recursion",
  "azalea-auth",
@@ -507,7 +508,7 @@ dependencies = [
 [[package]]
 name = "azalea-protocol-macros"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -517,7 +518,7 @@ dependencies = [
 [[package]]
 name = "azalea-registry"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-buf",
  "azalea-registry-macros",
@@ -528,7 +529,7 @@ dependencies = [
 [[package]]
 name = "azalea-registry-macros"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "quote",
  "syn",
@@ -537,7 +538,7 @@ dependencies = [
 [[package]]
 name = "azalea-world"
 version = "0.11.0+mc1.21.4"
-source = "git+https://github.com/azalea-rs/azalea.git#4fb6b077464e14f816e4c4fe54ff648e8c3d0ede"
+source = "git+https://github.com/azalea-rs/azalea.git#27945c8870c832970dfe15b9bf9f567c0ad96ea4"
 dependencies = [
  "azalea-block",
  "azalea-buf",
@@ -548,6 +549,7 @@ dependencies = [
  "nohash-hasher",
  "parking_lot",
  "rustc-hash 2.1.1",
+ "serde",
  "simdnbt",
  "thiserror 2.0.11",
  "tracing",
@@ -828,9 +830,9 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 
 [[package]]
 name = "cc"
-version = "1.2.14"
+version = "1.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
+checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
 dependencies = [
  "shlex",
 ]
@@ -898,9 +900,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.29"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184"
+checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -908,9 +910,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.29"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9"
+checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1414,9 +1416,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hickory-proto"
-version = "0.24.3"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad3d6d98c648ed628df039541a5577bee1a7c83e9e16fe3dbedeea4cdfeb971"
+checksum = "92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248"
 dependencies = [
  "async-trait",
  "cfg-if",
@@ -1438,9 +1440,9 @@ dependencies = [
 
 [[package]]
 name = "hickory-resolver"
-version = "0.24.3"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf287bde7b776e85d7188e6e5db7cf410a2f9531fe82817eb87feed034c8d14"
+checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -1709,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "inout"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
  "generic-array",
 ]
@@ -1808,9 +1810,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 
 [[package]]
 name = "lru-cache"
@@ -1875,9 +1877,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
 ]
@@ -2321,9 +2323,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
 dependencies = [
  "bitflags",
 ]
@@ -2417,9 +2419,9 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.9"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24"
+checksum = "d34b5020fcdea098ef7d95e9f89ec15952123a4a039badd09fabebe9e963e839"
 dependencies = [
  "cc",
  "cfg-if",
@@ -2557,18 +2559,18 @@ checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2577,9 +2579,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.138"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
 dependencies = [
  "itoa",
  "memchr",
@@ -3091,15 +3093,15 @@ checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
 
 [[package]]
 name = "typenum"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
 
 [[package]]
 name = "unicode-xid"
@@ -3416,9 +3418,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603"
+checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
 dependencies = [
  "memchr",
 ]
diff --git a/src/events.rs b/src/events.rs
index fb322b3..bb4da50 100644
--- a/src/events.rs
+++ b/src/events.rs
@@ -53,7 +53,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> anyhow:
         Event::Death(Some(packet)) => {
             let death_data = state.lua.create_table()?;
             death_data.set("message", packet.message.to_string())?;
-            death_data.set("player_id", packet.player_id)?;
+            death_data.set("player_id", packet.player_id.0)?;
             call_listeners(&state, "death", death_data).await;
         }
         Event::Disconnect(message) => {
diff --git a/src/lua/client/interaction.rs b/src/lua/client/interaction.rs
index 5215c37..563b57c 100644
--- a/src/lua/client/interaction.rs
+++ b/src/lua/client/interaction.rs
@@ -8,7 +8,7 @@ use azalea::{
 use log::error;
 use mlua::{Lua, Result, UserDataRef};
 
-pub async fn attack(_lua: Lua, client: UserDataRef<Client>, entity_id: u32) -> Result<()> {
+pub async fn attack(_lua: Lua, client: UserDataRef<Client>, entity_id: i32) -> Result<()> {
     client.clone().attack(MinecraftEntityId(entity_id));
 
     while client.get_tick_broadcaster().recv().await.is_ok() {
diff --git a/src/lua/client/movement.rs b/src/lua/client/movement.rs
index 8d909ea..5d9d620 100644
--- a/src/lua/client/movement.rs
+++ b/src/lua/client/movement.rs
@@ -8,6 +8,7 @@ use azalea::{
         goals::{BlockPosGoal, Goal, RadiusGoal, ReachBlockPosGoal, XZGoal, YGoal},
     },
     protocol::packets::game::{ServerboundPlayerCommand, s_player_command::Action},
+    world::MinecraftEntityId,
 };
 use log::error;
 use mlua::{FromLua, Lua, Result, Table, UserDataRef, Value};
@@ -186,7 +187,7 @@ pub fn set_jumping(_lua: &Lua, client: &mut Client, jumping: bool) -> Result<()>
 
 pub fn set_sneaking(_lua: &Lua, client: &Client, sneaking: bool) -> Result<()> {
     if let Err(error) = client.write_packet(ServerboundPlayerCommand {
-        id: client.entity.index(),
+        id: client.component::<MinecraftEntityId>(),
         action: if sneaking {
             Action::PressShiftKey
         } else {
@@ -215,7 +216,7 @@ pub fn stop_pathfinding(_lua: &Lua, client: &Client, _: ()) -> Result<()> {
 
 pub fn stop_sleeping(_lua: &Lua, client: &Client, _: ()) -> Result<()> {
     if let Err(error) = client.write_packet(ServerboundPlayerCommand {
-        id: client.entity.index(),
+        id: client.component::<MinecraftEntityId>(),
         action: Action::StopSleeping,
         data: 0,
     }) {