Skip to content

Commit

Permalink
fix chrash when using /skinsdb set without parameter or /skinsdb list…
Browse files Browse the repository at this point in the history
… public
  • Loading branch information
Lejo1 authored and bell07 committed May 25, 2020
1 parent ec30267 commit 55704e1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
13 changes: 8 additions & 5 deletions chatcommands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@ minetest.register_chatcommand("skinsdb", {
end

if command == "set" then
local success = skins.set_player_skin(player, parameter)
if success then
return true, S("skin set to").." "..parameter
else
return false, S("invalid skin").." "..parameter
if parameter then
local success = skins.set_player_skin(player, parameter)
if success then
return true, S("skin set to").." "..parameter
else
return false, S("invalid skin").." "..parameter
end
else return false, S("Requires skin key")
end
elseif command == "list" then
local list
Expand Down
1 change: 1 addition & 0 deletions locale/skinsdb.de.tr
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ skin set to=Skin ist jetzt
invalid skin=unbekannter Skin
unknown parameter=unbekannter Parameter
Skins=Aussehen
Requires skin key=Benötigt Skin-Name
1 change: 1 addition & 0 deletions locale/template.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ unknown parameter=
unknown skin=
Downloads the specified range of skins and shuts down the server=
Skins=
Requires skin key=
5 changes: 3 additions & 2 deletions skin_meta_api.lua
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ end

function skin_class:is_applicable_for_player(playername)
local assigned_player = self:get_meta("playername")
return minetest.check_player_privs(playername, {server=true}) or assigned_player == nil or assigned_player == true or
(assigned_player:lower() == playername:lower())
return assigned_player == nil or assigned_player == true or
playername and (minetest.check_player_privs(playername, {server=true}) or
assigned_player:lower() == playername:lower())
end

0 comments on commit 55704e1

Please sign in to comment.