Merge branch 'master' into nalc-1.2

This commit is contained in:
Sys Quatre 2019-05-09 22:41:39 +02:00
commit 47f889c178
2 changed files with 8 additions and 0 deletions

View File

@ -23,11 +23,17 @@ ie.package.path =
-- /usr/local/share and /usr/local/lib but LuaSocket is often installed under
-- /usr/share and /usr/lib.
if not rawget(_G, "jit") and package.config:sub(1, 1) == "/" then
ie.package.path = ie.package.path..
";/usr/share/lua/5.1/?.lua"..
";/usr/share/lua/5.1/?/init.lua"
ie.package.cpath = ie.package.cpath..
";/usr/lib/lua/5.1/?.so"
ie.package.cpath = "/usr/lib/x86_64-linux-gnu/lua/5.1/?.so;"..ie.package.cpath
end
-- Temporarily set require so that LuaIRC can access it

View File

@ -13,6 +13,8 @@ end
function irc.player_join(name)
if irc.joined_players[name] then
return false, "You are already in the channel"
elseif not minetest.get_player_by_name(name) then
return false, "You need to be in-game to join the channel"
end
irc.joined_players[name] = true
return true, "You joined the channel"