From bb324bec26a5f2a1a19b677ecb4d36a2c71cf2d8 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <77750390+ethanaobrien@users.noreply.github.com>
Date: Fri, 3 May 2024 17:00:25 -0500
Subject: [PATCH] Fix this thing I hope

---
 src/router/global.rs      | 2 +-
 src/router/lottery/mod.rs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/router/global.rs b/src/router/global.rs
index a47b24c..8341824 100644
--- a/src/router/global.rs
+++ b/src/router/global.rs
@@ -330,7 +330,7 @@ pub fn lp_modification(user: &mut JsonValue, change_amount: u64, remove: bool) {
 // false - already has
 pub fn give_character(id: String, user: &mut JsonValue) -> bool {
     for (_i, data) in user["card_list"].members().enumerate() {
-        if data["master_card_id"].to_string() == id {
+        if data["master_card_id"].to_string() == id || data["id"].to_string() == id {
             give_item(19100001, 100, user);
             return false;
         }
diff --git a/src/router/lottery/mod.rs b/src/router/lottery/mod.rs
index ebed652..f90eb83 100644
--- a/src/router/lottery/mod.rs
+++ b/src/router/lottery/mod.rs
@@ -189,7 +189,6 @@ pub fn lottery_post(req: HttpRequest, body: String) -> HttpResponse {
         let mut new_ids = array![];
         for (_i, data) in cardstogive.members().enumerate() {
             if !global::give_character(data["master_card_id"].to_string(), &mut user) {
-                global::give_item(19100001, 20, &mut user);
                 continue;
             }
             new_ids.push(data["master_lottery_item_id"].to_string()).unwrap();