Merge remote-tracking branch 'upstream/master'

Add player nil check to toolranks.new_afteruse() to fix error.

init.lua

@@ -63,11 +63,13 @@ end
 function toolranks.new_afteruse(itemstack, user, node, digparams)
   local itemmeta = itemstack:get_meta()
   local itemdef = itemstack:get_definition()
-  local itemdesc = itemdef.original_description
+  local itemdesc = itemdef.original_description or ""
   local dugnodes = tonumber(itemmeta:get_string("dug")) or 0
   local lastlevel = tonumber(itemmeta:get_string("lastlevel")) or 0
   local most_digs = mod_storage:get_int("most_digs") or 0
   local most_digs_user = mod_storage:get_string("most_digs_user") or 0
+  local pname = user:get_player_name()
+  if not pname then return itemstack end -- player nil check
 
   if digparams.wear > 0 then -- Only count nodes that spend the tool
     dugnodes = dugnodes + 1
@@ -75,24 +77,24 @@ function toolranks.new_afteruse(itemstack, user, node, digparams)
   end
 
   if dugnodes > most_digs then
-    if most_digs_user ~= user:get_player_name() then -- Avoid spam.
+    if most_digs_user ~= pname then -- Avoid spam.
       minetest.chat_send_all(S(
         "Most used tool is now a @1@2@3 owned by @4 with @5 uses.",
         toolranks.colors.green,
         itemdesc,
         toolranks.colors.white,
-        user:get_player_name(),
+        pname,
         dugnodes
       ))
     end
     mod_storage:set_int("most_digs", dugnodes)
-    mod_storage:set_string("most_digs_user", user:get_player_name())
+    mod_storage:set_string("most_digs_user", pname)
   end
 
   if itemstack:get_wear() > 60135 then
     minetest.chat_send_player(user:get_player_name(), S("Your tool is about to break!"))
     minetest.sound_play("default_tool_breaks", {
-      to_player = user:get_player_name(),
+      to_player = pname,
       gain = 2.0,
     })
   end
@@ -107,29 +109,38 @@ function toolranks.new_afteruse(itemstack, user, node, digparams)
     )
     minetest.chat_send_player(user:get_player_name(), levelup_text)
     minetest.sound_play("toolranks_levelup", {
-      to_player = user:get_player_name(),
+      to_player = pname,
       gain = 2.0,
     })
+	-- Make tool better by modifying tool_capabilities (if defined)
+    if itemdef.tool_capabilities then
+      local speed_multiplier = 1 + (level * level_multiplier * (max_speed - 1))
+      local use_multiplier = 1 + (level * level_multiplier * (max_use - 1))
+      local caps = table.copy(itemdef.tool_capabilities)
 
-    local speed_multiplier = 1 + (level * level_multiplier * (max_speed - 1))
-    local use_multiplier = 1 + (level * level_multiplier * (max_use - 1))
-    local caps = table.copy(itemdef.tool_capabilities)
+      caps.full_punch_interval = caps.full_punch_interval and (caps.full_punch_interval / speed_multiplier)
+      caps.punch_attack_uses = caps.punch_attack_uses and (caps.punch_attack_uses * use_multiplier)
 
-    caps.full_punch_interval = caps.full_punch_interval and (caps.full_punch_interval / speed_multiplier)
-    caps.punch_attack_uses = caps.punch_attack_uses and (caps.punch_attack_uses * use_multiplier)
-
-    for _,c in pairs(caps.groupcaps) do
-      c.uses = c.uses * use_multiplier
-      for i,t in ipairs(c.times) do
-        c.times[i] = t / speed_multiplier
+      for _,c in pairs(caps.groupcaps) do
+        c.uses = c.uses * use_multiplier
+        for i,t in ipairs(c.times) do
+          c.times[i] = t / speed_multiplier
+        end
       end
-    end
-    itemmeta:set_tool_capabilities(caps)
+      itemmeta:set_tool_capabilities(caps)
+	end
+  end
+
+  -- Old method for compatibility with tools without tool_capabilities defined
+  local wear = digparams.wear
+  if level > 0 and not itemdef.tool_capabilities then
+    local use_multiplier = 1 + (level * level_multiplier * (max_use - 1))
+    wear = wear / use_multiplier
   end
 
   itemmeta:set_string("lastlevel", level)
   itemmeta:set_string("description", toolranks.create_description(itemdesc, dugnodes))
-  itemstack:add_wear(digparams.wear)
+  itemstack:add_wear(wear)
   return itemstack
 end
 
@@ -174,3 +185,5 @@ toolranks.add_tool("default:shovel_steel")
 toolranks.add_tool("default:shovel_bronze")
 toolranks.add_tool("default:shovel_mese")
 toolranks.add_tool("default:shovel_diamond")
+
+minetest.log("action", "[toolranks] loaded.")