aboutsummaryrefslogtreecommitdiff
path: root/server/src/entity
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-09-24 12:43:42 +0200
committermetamuffin <metamuffin@disroot.org>2024-09-24 12:43:42 +0200
commit9453f5f4b3e68d79fb09494b55bc885432ac0351 (patch)
tree66eea4b897cda02db1b72bbe305afcc6e4e8a4d8 /server/src/entity
parentf68d3a579f05e5bbe490cbaa9cc4d1e1bff208ac (diff)
downloadhurrycurry-9453f5f4b3e68d79fb09494b55bc885432ac0351.tar
hurrycurry-9453f5f4b3e68d79fb09494b55bc885432ac0351.tar.bz2
hurrycurry-9453f5f4b3e68d79fb09494b55bc885432ac0351.tar.zst
format server in english locale
Diffstat (limited to 'server/src/entity')
-rw-r--r--server/src/entity/book.rs2
-rw-r--r--server/src/entity/campaign.rs2
-rw-r--r--server/src/entity/mod.rs2
-rw-r--r--server/src/entity/tutorial.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/server/src/entity/book.rs b/server/src/entity/book.rs
index 11ec847b..5833a871 100644
--- a/server/src/entity/book.rs
+++ b/server/src/entity/book.rs
@@ -16,7 +16,7 @@
*/
use super::{Entity, EntityContext};
-use crate::TrError;
+use crate::message::TrError;
use anyhow::Result;
use hurrycurry_protocol::{glam::IVec2, Menu, PacketC, PlayerID};
diff --git a/server/src/entity/campaign.rs b/server/src/entity/campaign.rs
index 8edebd41..5838d3ce 100644
--- a/server/src/entity/campaign.rs
+++ b/server/src/entity/campaign.rs
@@ -16,7 +16,7 @@
*/
use super::{Entity, EntityContext};
-use crate::{scoreboard::ScoreboardStore, server::GameServerExt, trm, TrError};
+use crate::{message::TrError, scoreboard::ScoreboardStore, server::GameServerExt, trm};
use anyhow::Result;
use hurrycurry_protocol::{
glam::{IVec2, Vec2},
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index aa565c83..3dad1311 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -25,7 +25,7 @@ pub mod item_portal;
pub mod player_portal;
pub mod tutorial;
-use crate::{data::ItemTileRegistry, scoreboard::ScoreboardStore, TrError};
+use crate::{data::ItemTileRegistry, scoreboard::ScoreboardStore, message::TrError};
use anyhow::{anyhow, Result};
use book::Book;
use campaign::{Gate, GateCondition, Map};
diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs
index b1503004..3189687b 100644
--- a/server/src/entity/tutorial.rs
+++ b/server/src/entity/tutorial.rs
@@ -16,7 +16,7 @@
*/
use super::{Entity, EntityContext};
-use crate::{trm, TrError};
+use crate::{message::TrError, trm};
use anyhow::Result;
use hurrycurry_protocol::{
glam::IVec2, ItemIndex, Message, PacketC, PlayerID, Recipe, RecipeIndex, TileIndex,