Merge https://github.com/entuland/rhotator into HEAD
commit
3c9a9cbe43
2
init.lua
2
init.lua
|
@ -559,7 +559,7 @@ rhotator.check_on_rotate_handler = function(pos, node, nodedef, player, click, n
|
||||||
return false
|
return false
|
||||||
elseif nodedef.on_rotate then
|
elseif nodedef.on_rotate then
|
||||||
-- Copy pos and node because callback can modify it
|
-- Copy pos and node because callback can modify it
|
||||||
local pass_node = {name = node.name, param1 = node.param1, param2 = node.param2}
|
local pass_node = table.copy(node)
|
||||||
local pass_pos = vector.new(pos)
|
local pass_pos = vector.new(pos)
|
||||||
local result = nodedef.on_rotate(pass_pos, pass_node, player, click, new_param2)
|
local result = nodedef.on_rotate(pass_pos, pass_node, player, click, new_param2)
|
||||||
if result == true then
|
if result == true then
|
||||||
|
|
18
notify.lua
18
notify.lua
|
@ -20,7 +20,9 @@ local function hud_remove(player, playername)
|
||||||
if os.time() < hud_timeout_seconds + hud.time then
|
if os.time() < hud_timeout_seconds + hud.time then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
player:hud_remove(hud.id)
|
if player and player.hud_remove then
|
||||||
|
player:hud_remove(hud.id)
|
||||||
|
end
|
||||||
huds[playername] = nil
|
huds[playername] = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -36,11 +38,13 @@ local function hud_create(player, message, params)
|
||||||
def.text = message or def.text
|
def.text = message or def.text
|
||||||
def.hud_elem_type = def.hud_elem_type or "text"
|
def.hud_elem_type = def.hud_elem_type or "text"
|
||||||
def.name = mod_name .. "_feedback"
|
def.name = mod_name .. "_feedback"
|
||||||
local id = player:hud_add(def)
|
if player and player.hud_add then
|
||||||
huds[playername] = {
|
local id = player:hud_add(def)
|
||||||
id = id,
|
huds[playername] = {
|
||||||
time = os.time(),
|
id = id,
|
||||||
}
|
time = os.time(),
|
||||||
|
}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
notify.warn = function(player, message)
|
notify.warn = function(player, message)
|
||||||
|
@ -67,7 +71,7 @@ notify.__call = function(self, player, message, params)
|
||||||
end
|
end
|
||||||
message = "[" .. mod_name .. "] " .. message
|
message = "[" .. mod_name .. "] " .. message
|
||||||
local hud = huds[playername]
|
local hud = huds[playername]
|
||||||
if hud then
|
if hud and player.hud_remove then
|
||||||
player:hud_remove(hud.id)
|
player:hud_remove(hud.id)
|
||||||
end
|
end
|
||||||
hud_create(player, message, params)
|
hud_create(player, message, params)
|
||||||
|
|
Loading…
Reference in New Issue