Chests: Revert inventory name

[oweals/minetest_game.git] / mods / default / player.lua

diff --git a/mods/default/player.lua b/mods/default/player.lua
index 87618e3125eca21720427f6f5d5a33b62a05c041..cd89a24c5c3361d1a4d8b6defee3db4c766b4683 100644 (file)
--- a/mods/default/player.lua
+++ b/mods/default/player.lua
@@ -15,7 +15,7 @@ function default.player_register_model(name, def)
 end
 
 -- Default player appearance
-default.player_register_model("character.x", {
+default.player_register_model("character.b3d", {
        animation_speed = 30,
        textures = {"character.png", },
        animations = {
@@ -25,7 +25,6 @@ default.player_register_model("character.x", {
                walk      = { x=168, y=187, },
                mine      = { x=189, y=198, },
                walk_mine = { x=200, y=219, },
-               -- Extra animations (not currently used by the game).
                sit       = { x= 81, y=160, },
        },
 })
@@ -93,11 +92,12 @@ end
 -- Update appearance when the player joins
 minetest.register_on_joinplayer(function(player)
        default.player_attached[player:get_player_name()] = false
-       default.player_set_model(player, "character.x")
+       default.player_set_model(player, "character.b3d")
        player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30)
-       
+
        -- set GUI
-       if not minetest.setting_getbool("creative_mode") then
+       if not (creative and creative.is_enabled_for
+                       and creative.is_enabled_for(player:get_player_name())) then
                player:set_inventory_formspec(default.gui_survival_form)
        end
        player:hud_set_hotbar_image("gui_hotbar.png")