summaryrefslogtreecommitdiff
path: root/server/src/entity/tutorial.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-12-23 15:37:11 +0100
committermetamuffin <metamuffin@disroot.org>2024-12-23 15:37:11 +0100
commit1a9f7e9a20bff0fbc854454f131d4bc546e73e72 (patch)
tree7be16db47cd819177ae73d42af7b59c37593060a /server/src/entity/tutorial.rs
parentbd71cd120fa4d8caf4987fd9c76838ccbeec19f7 (diff)
downloadhurrycurry-1a9f7e9a20bff0fbc854454f131d4bc546e73e72.tar
hurrycurry-1a9f7e9a20bff0fbc854454f131d4bc546e73e72.tar.bz2
hurrycurry-1a9f7e9a20bff0fbc854454f131d4bc546e73e72.tar.zst
two-handed server
Diffstat (limited to 'server/src/entity/tutorial.rs')
-rw-r--r--server/src/entity/tutorial.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs
index 44244862..33c0e507 100644
--- a/server/src/entity/tutorial.rs
+++ b/server/src/entity/tutorial.rs
@@ -144,7 +144,7 @@ impl StepContext<'_> {
.game
.players
.get(&self.player)
- .is_some_and(|p| p.item.as_ref().is_some_and(|i| i.kind == item))
+ .is_some_and(|p| p.items.iter().flatten().any(|i| i.kind == item))
}
pub fn find_demand(&self, item: ItemIndex) -> Option<IVec2> {
self.ent
@@ -228,7 +228,7 @@ impl StepContext<'_> {
.game
.players
.get(&self.player)
- .is_some_and(|p| p.item.as_ref().is_some_and(|i| i.kind == item))
+ .is_some_and(|p| p.items.iter().flatten().any(|i| i.kind == item))
{
if let Some(pos) = self.find_demand(item) {
Err((Some(pos), trm!("s.tutorial.serve")))