aboutsummaryrefslogtreecommitdiff
path: root/server/src/entity/mod.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-10-19 23:50:23 +0200
committermetamuffin <metamuffin@disroot.org>2025-10-19 23:50:23 +0200
commitab83f982601d93b2399102c4d030fd6e13c4c735 (patch)
treec0536ca9e328707d6b4f4cfc7a2307713466a5be /server/src/entity/mod.rs
parent231a5ce21fcee9195fcc504ee672e4464d627c47 (diff)
downloadhurrycurry-ab83f982601d93b2399102c4d030fd6e13c4c735.tar
hurrycurry-ab83f982601d93b2399102c4d030fd6e13c4c735.tar.bz2
hurrycurry-ab83f982601d93b2399102c4d030fd6e13c4c735.tar.zst
Refactor and move interaction code
Diffstat (limited to 'server/src/entity/mod.rs')
-rw-r--r--server/src/entity/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index 34815d0d..2e235c95 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -38,8 +38,8 @@ use campaign::{Gate, Map};
use conveyor::Conveyor;
use customers::Customers;
use environment_effect::{EnvironmentController, EnvironmentEffectController};
-use hurrycurry_game_core::Game;
use hurrycurry_data::{Serverdata, entities::EntityDecl};
+use hurrycurry_game_core::Game;
use hurrycurry_locale::TrError;
use hurrycurry_protocol::{Character, ItemLocation, PacketC, PacketS, PlayerID};
use item_portal::ItemPortal;
@@ -66,7 +66,7 @@ pub struct EntityContext<'a> {
}
pub trait Entity: Any {
- fn tick(&mut self, _c: EntityContext<'_>) -> Result<()> {
+ fn tick(&mut self, _c: EntityContext<'_>) -> Result<(), TrError> {
Ok(())
}
fn finished(&self) -> bool {