aboutsummaryrefslogtreecommitdiff
path: root/server/src/entity/campaign.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-10-19 00:38:09 +0200
committermetamuffin <metamuffin@disroot.org>2025-10-19 00:38:09 +0200
commit62d918e5feeaf5b3add982a5baaffb201a1f2ece (patch)
treeb14a0fa01f9df692592bf5d16543f43b6eb933d6 /server/src/entity/campaign.rs
parent6b156bea343a0fd9a043dcfe7113986855a89aab (diff)
downloadhurrycurry-62d918e5feeaf5b3add982a5baaffb201a1f2ece.tar
hurrycurry-62d918e5feeaf5b3add982a5baaffb201a1f2ece.tar.bz2
hurrycurry-62d918e5feeaf5b3add982a5baaffb201a1f2ece.tar.zst
Implement interaction with other players through id instead of tile pos
Diffstat (limited to 'server/src/entity/campaign.rs')
-rw-r--r--server/src/entity/campaign.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/entity/campaign.rs b/server/src/entity/campaign.rs
index 33baf631..ddbdc3bc 100644
--- a/server/src/entity/campaign.rs
+++ b/server/src/entity/campaign.rs
@@ -21,7 +21,7 @@ use anyhow::Result;
use hurrycurry_data::entities::GateCondition;
use hurrycurry_locale::{TrError, trm};
use hurrycurry_protocol::{
- Message, PacketC, PlayerID, TileIndex,
+ ItemLocation, Message, PacketC, PlayerID, TileIndex,
glam::{IVec2, Vec2},
};
@@ -70,10 +70,10 @@ impl Entity for Gate {
fn interact(
&mut self,
c: EntityContext<'_>,
- pos: Option<IVec2>,
+ pos: Option<ItemLocation>,
_player: PlayerID,
) -> Result<bool, TrError> {
- if !self.unlocked && pos == Some(self.pos) {
+ if !self.unlocked && pos == Some(ItemLocation::Tile(self.pos)) {
c.packet_out.push_back(PacketC::ServerMessage {
message: trm!(
"s.campaign.unlock_condition",