Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix whitespace errors to silence luacheck.
Currently all minetest_game PR's are failing travis since the
upstream luacheck now also warns about whitespace issues, and
there are a few of those in the code. This fixes all of them
so we can yet again rely on luacheck.
  • Loading branch information
sofar committed Nov 20, 2016
1 parent 47efa2f commit 75caa91
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion mods/beds/beds.lua
Expand Up @@ -66,7 +66,7 @@ beds.register_bed("beds:bed", {
}, },
top = { top = {
"beds_bed_top_top.png^[transformR90", "beds_bed_top_top.png^[transformR90",
"default_wood.png", "default_wood.png",
"beds_bed_side_top_r.png", "beds_bed_side_top_r.png",
"beds_bed_side_top_r.png^[transformfx", "beds_bed_side_top_r.png^[transformfx",
"beds_bed_side_top.png", "beds_bed_side_top.png",
Expand Down
2 changes: 1 addition & 1 deletion mods/beds/functions.lua
Expand Up @@ -174,7 +174,7 @@ end


-- Callbacks -- Callbacks
-- Only register respawn callback if respawn enabled -- Only register respawn callback if respawn enabled
if enable_respawn then if enable_respawn then
-- respawn player at bed if enabled and valid position is found -- respawn player at bed if enabled and valid position is found
minetest.register_on_respawnplayer(function(player) minetest.register_on_respawnplayer(function(player)
local name = player:get_player_name() local name = player:get_player_name()
Expand Down
2 changes: 1 addition & 1 deletion mods/default/furnace.lua
Expand Up @@ -4,7 +4,7 @@
-- --


local function active_formspec(fuel_percent, item_percent) local function active_formspec(fuel_percent, item_percent)
local formspec = local formspec =
"size[8,8.5]".. "size[8,8.5]"..
default.gui_bg.. default.gui_bg..
default.gui_bg_img.. default.gui_bg_img..
Expand Down
2 changes: 1 addition & 1 deletion mods/default/player.lua
Expand Up @@ -94,7 +94,7 @@ minetest.register_on_joinplayer(function(player)
default.player_attached[player:get_player_name()] = false default.player_attached[player:get_player_name()] = false
default.player_set_model(player, "character.b3d") 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) player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30)

-- set GUI -- set GUI
if not minetest.setting_getbool("creative_mode") then if not minetest.setting_getbool("creative_mode") then
player:set_inventory_formspec(default.gui_survival_form) player:set_inventory_formspec(default.gui_survival_form)
Expand Down
2 changes: 1 addition & 1 deletion mods/doors/init.lua
Expand Up @@ -519,7 +519,7 @@ function doors.register_trapdoor(name, def)
if not name:find(":") then if not name:find(":") then
name = "doors:" .. name name = "doors:" .. name
end end

local name_closed = name local name_closed = name
local name_opened = name.."_open" local name_opened = name.."_open"


Expand Down
8 changes: 4 additions & 4 deletions mods/farming/nodes.lua
Expand Up @@ -111,7 +111,7 @@ minetest.register_abm({
end end
local nn_def = minetest.registered_nodes[nn.name] or nil local nn_def = minetest.registered_nodes[nn.name] or nil
pos.y = pos.y - 1 pos.y = pos.y - 1

if nn_def and nn_def.walkable and minetest.get_item_group(nn.name, "plant") == 0 then if nn_def and nn_def.walkable and minetest.get_item_group(nn.name, "plant") == 0 then
minetest.set_node(pos, {name = base}) minetest.set_node(pos, {name = base})
return return
Expand All @@ -133,7 +133,7 @@ minetest.register_abm({
if minetest.get_item_group(nn.name, "plant") == 0 and minetest.get_item_group(nn.name, "seed") == 0 then if minetest.get_item_group(nn.name, "plant") == 0 and minetest.get_item_group(nn.name, "seed") == 0 then
minetest.set_node(pos, {name = base}) minetest.set_node(pos, {name = base})
end end

-- if its wet turn it back into dry soil -- if its wet turn it back into dry soil
elseif wet_lvl == 1 then elseif wet_lvl == 1 then
minetest.set_node(pos, {name = dry}) minetest.set_node(pos, {name = dry})
Expand All @@ -144,7 +144,7 @@ minetest.register_abm({
}) })




for i = 1, 5 do for i = 1, 5 do
minetest.override_item("default:grass_"..i, {drop = { minetest.override_item("default:grass_"..i, {drop = {
max_items = 1, max_items = 1,
items = { items = {
Expand All @@ -153,7 +153,7 @@ for i = 1, 5 do
} }
}}) }})
end end

minetest.override_item("default:junglegrass", {drop = { minetest.override_item("default:junglegrass", {drop = {
max_items = 1, max_items = 1,
items = { items = {
Expand Down
4 changes: 2 additions & 2 deletions mods/sethome/init.lua
Expand Up @@ -43,9 +43,9 @@ end
sethome.get = function(name) sethome.get = function(name)
local pos = homepos[name] local pos = homepos[name]
if pos then if pos then
return vector.new(pos) return vector.new(pos)
else else
return nil return nil
end end
end end


Expand Down

0 comments on commit 75caa91

Please sign in to comment.