diff --git a/block_league/src/arena_lib/arena_editor.lua b/block_league/src/arena_lib/arena_editor.lua index cadfc14..b243cf6 100644 --- a/block_league/src/arena_lib/arena_editor.lua +++ b/block_league/src/arena_lib/arena_editor.lua @@ -134,7 +134,6 @@ minetest.register_tool("block_league:editor_goal", { description = S("Set team goal (LMB orange, RMB blue)"), inventory_image = "bl_editor_goal.png", groups = {not_in_creative_inventory = 1}, - on_place = function() end, on_drop = function() end, on_use = function(itemstack, user, pointed_thing) diff --git a/block_league/src/weapons/weapons.lua b/block_league/src/weapons/weapons.lua index aa0be8d..2e28ab4 100644 --- a/block_league/src/weapons/weapons.lua +++ b/block_league/src/weapons/weapons.lua @@ -79,8 +79,6 @@ function block_league.register_weapon(name, def) description = def.description, profile_description = def.profile_description or "", - action1 = def.action1 or "", - action2 = def.action2 or "", drawtype = def.mesh and "mesh" or "item", mesh = def.mesh or nil, tiles = def.tiles or nil, @@ -618,7 +616,7 @@ end function attack_hitscan(user, weapon, action) - local pointed_objects = block_league.get_pointed_objects(user, action.range or melee_range, action.pierce) + local pointed_objects = block_league.get_pointed_objects(user, action.range or MELEE_RANGE, action.pierce) if action.trail then local dir = user:get_look_dir()