mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-12-25 10:52:25 +01:00
Fix some merging stuff
This commit is contained in:
parent
ecb4c82600
commit
7d8a1e1e5f
@ -429,9 +429,9 @@ function mcl_inventory.set_creative_formspec(player)
|
||||
"tooltip[__mcl_doc;" .. F(S("Help")) .. "]",
|
||||
|
||||
-- Advancements button
|
||||
"image_button[11.575,3.3;1.1,1.1;mcl_achievements_button.png;__mcl_achievements;]" ..
|
||||
--"style_type[image_button;border=;bgimg=;bgimg_pressed=]" ..
|
||||
"tooltip[__mcl_achievements;" .. F(S("Advancements")) .. "]" ..
|
||||
"image_button[11.575,3.325;1.1,1.1;mcl_achievements_button.png;__mcl_achievements;]",
|
||||
--"style_type[image_button;border=;bgimg=;bgimg_pressed=]",
|
||||
"tooltip[__mcl_achievements;" .. F(S("Advancements")) .. "]",
|
||||
|
||||
-- Switch stack size button
|
||||
"image_button[11.575,4.575;1.1,1.1;default_apple.png;__switch_stack;]",
|
||||
|
@ -93,14 +93,14 @@ minetest.register_chatcommand("gamemode", {
|
||||
if not p then
|
||||
return false, S("Player not online")
|
||||
end
|
||||
if args[1] ~= nil and not in_table(args[1], gamemodes) then
|
||||
if args[1] ~= nil and not in_table(args[1], mcl_gamemode.gamemodes) then
|
||||
return false, S("Gamemode " .. args[1] .. " does not exist.")
|
||||
elseif args[1] ~= nil then
|
||||
mcl_inventory.player_set_gamemode(p, args[1])
|
||||
mcl_gamemode.set_gamemode(p, args[1])
|
||||
end
|
||||
--Result message - show effective game mode
|
||||
local gm = p:get_meta():get_string("gamemode")
|
||||
if gm == "" then gm = gamemodes[1] end
|
||||
if gm == "" then gm = mcl_gamemode.gamemodes[1] end
|
||||
return true, S("Gamemode for player ") .. n .. S(": " .. gm)
|
||||
end
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user