aboutsummaryrefslogtreecommitdiff
path: root/server/src/entity
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-07-08 17:19:25 +0200
committermetamuffin <metamuffin@disroot.org>2024-07-08 17:19:25 +0200
commit90f42ec7a3f28fb3a87c233a81e8f65de832983e (patch)
treedba1334af5bb711555add7159874d1eabd89a4db /server/src/entity
parent70bb8744cd742dc6c8a71ab174e4a1b058c7bec8 (diff)
downloadhurrycurry-90f42ec7a3f28fb3a87c233a81e8f65de832983e.tar
hurrycurry-90f42ec7a3f28fb3a87c233a81e8f65de832983e.tar.bz2
hurrycurry-90f42ec7a3f28fb3a87c233a81e8f65de832983e.tar.zst
move glam dep to protocol crate
Diffstat (limited to 'server/src/entity')
-rw-r--r--server/src/entity/conveyor.rs3
-rw-r--r--server/src/entity/mod.rs3
2 files changed, 2 insertions, 4 deletions
diff --git a/server/src/entity/conveyor.rs b/server/src/entity/conveyor.rs
index f4692f6d..4d11ffe1 100644
--- a/server/src/entity/conveyor.rs
+++ b/server/src/entity/conveyor.rs
@@ -21,8 +21,7 @@ use crate::{
game::{interact_effect, Tile},
};
use anyhow::{anyhow, Result};
-use glam::IVec2;
-use hurrycurry_protocol::{ItemLocation, PacketC};
+use hurrycurry_protocol::{glam::IVec2, ItemLocation, PacketC};
use std::collections::{HashMap, VecDeque};
#[derive(Debug, Default, Clone)]
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index 1bc558b1..925ed5f4 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -19,8 +19,7 @@ pub mod conveyor;
use crate::{data::Gamedata, game::Tile};
use anyhow::{anyhow, Result};
use conveyor::Conveyor;
-use glam::IVec2;
-use hurrycurry_protocol::PacketC;
+use hurrycurry_protocol::{glam::IVec2, PacketC};
use serde::{Deserialize, Serialize};
use std::collections::{HashMap, VecDeque};