From 33737819a5041d23f4b290b7df1165b2282fdd63 Mon Sep 17 00:00:00 2001 From: Ethan O'Brien Date: Fri, 18 Oct 2024 16:41:10 -0500 Subject: [PATCH] Fix unknown consume type 0 --- src/router/items.rs | 4 +++- src/router/lottery.rs | 2 +- src/router/user.rs | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/router/items.rs b/src/router/items.rs index 83d9410..66e7f61 100644 --- a/src/router/items.rs +++ b/src/router/items.rs @@ -106,7 +106,9 @@ pub fn give_item(master_item_id: i64, amount: i64, user: &mut JsonValue) -> bool } pub fn use_item(item: &JsonValue, multiplier: i64, user: &mut JsonValue) { - if item["consumeType"] == 1 { + if item["consumeType"] == 0 { + // Is anything really ever free...? + } else if item["consumeType"] == 1 { remove_gems(user, item["amount"].as_i64().unwrap()); } else if item["consumeType"] == 4 { use_itemm(item["value"].as_i64().unwrap(), item["amount"].as_i64().unwrap() * multiplier, user); diff --git a/src/router/lottery.rs b/src/router/lottery.rs index 48cffc4..c42419b 100644 --- a/src/router/lottery.rs +++ b/src/router/lottery.rs @@ -102,7 +102,7 @@ pub fn lottery(_req: HttpRequest) -> Option { pub fn lottery_post(req: HttpRequest, body: String) -> Option { let key = global::get_login(req.headers(), &body); let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap(); - println!("lottery: {}", body); + //println!("lottery: {}", body); let mut user = userdata::get_acc(&key); let user2 = userdata::get_acc(&key); let mut missions = userdata::get_acc_missions(&key); diff --git a/src/router/user.rs b/src/router/user.rs index 2ee328b..35d3f1e 100644 --- a/src/router/user.rs +++ b/src/router/user.rs @@ -109,7 +109,7 @@ pub fn gift(req: HttpRequest, body: String) -> Option { pub fn user_post(req: HttpRequest, body: String) -> Option { let key = global::get_login(req.headers(), &body); let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap(); - + let mut user = userdata::get_acc(&key); if !body["name"].is_null() { @@ -148,7 +148,7 @@ pub fn user_post(req: HttpRequest, body: String) -> Option { } userdata::save_acc(&key, user.clone()); - + Some(object!{ "user": user["user"].clone(), "clear_mission_ids": []