bugfix for previous commit

Illarion-eV · Feb 23, 2025 · 4558a32 · 4558a32
1 parent f5aef1f
commit 4558a32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/magic/arcane/arcaneMagicDesk.lua b/magic/arcane/arcaneMagicDesk.lua
@@ -46,7 +46,7 @@ end
 local function bookFound(user)
 
     for _, book in pairs(grimoireCreation.books) do
-        if user:countItemAt("body",2619,{["magicBook"]="true"}) ~= 0 then
+        if user:countItemAt("body",book,{["magicBook"]="true"}) ~= 0 then
             return true
         end
     end

diff --git a/magic/arcane/createSpell.lua b/magic/arcane/createSpell.lua
@@ -29,17 +29,19 @@ local function getMagicBook(user)
     local leftItem = user:getItemAt(5)
     local rightItem = user:getItemAt(6)
 
-    for _, book in pairs(grimoireCreation.books) do
+    if leftItem:getData("magicBook") ~= "true" and rightItem:getData("magicBook") ~= "true" then --check for magic book data
+        return nil
+    end
+
+    for _, book in pairs(grimoireCreation.books) do --Check all valid book ids
 
-        if leftItem.id == book and leftItem:getData("magicBook") == "true" then
+        if leftItem.id == book then
             return leftItem
-        elseif rightItem.id == book and leftItem:getData("magicBook") == "true" then
+        elseif rightItem.id == book then
             return rightItem
         end
     end
 
-    debug("Error: We are now past the check for the grimoire but there is no grimoire.")
-
     return nil
 
 end