mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-29 05:51:05 +01:00
Merge pull request 'Make sure dying sign text respects protection' (#3727) from sign_dye_protection into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3727 Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
This commit is contained in:
commit
08cbd95a5e
2 changed files with 7 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
||||||
name = mcl_signs
|
name = mcl_signs
|
||||||
description = New and Improved signs - can be colored and made to glow.
|
description = New and Improved signs - can be colored and made to glow.
|
||||||
depends = mcl_core, mcl_sounds, mcl_dye, mcl_colors
|
depends = mcl_core, mcl_sounds, mcl_dye, mcl_colors, mcl_util
|
||||||
optional_depends = doc
|
optional_depends = doc
|
||||||
|
|
|
@ -307,7 +307,9 @@ mcl_signs.wall_standard = {
|
||||||
local item = clicker:get_wielded_item()
|
local item = clicker:get_wielded_item()
|
||||||
local iname = item:get_name()
|
local iname = item:get_name()
|
||||||
|
|
||||||
if node then
|
local protected = mcl_util.check_position_protection(pos, clicker)
|
||||||
|
|
||||||
|
if node and not protected then
|
||||||
if DEBUG then
|
if DEBUG then
|
||||||
minetest.log("verbose", "[mcl_signs] Wall_Sign Right Click event on valid node.")
|
minetest.log("verbose", "[mcl_signs] Wall_Sign Right Click event on valid node.")
|
||||||
end
|
end
|
||||||
|
@ -414,7 +416,9 @@ mcl_signs.standing_standard = {
|
||||||
local item = clicker:get_wielded_item()
|
local item = clicker:get_wielded_item()
|
||||||
local iname = item:get_name()
|
local iname = item:get_name()
|
||||||
|
|
||||||
if node then
|
local protected = mcl_util.check_position_protection(pos, clicker)
|
||||||
|
|
||||||
|
if node and not protected then
|
||||||
-- handle glow from glow_ink_sac *first*
|
-- handle glow from glow_ink_sac *first*
|
||||||
if DEBUG then
|
if DEBUG then
|
||||||
minetest.log("verbose", "[mcl_signs] Standing_Sign Right Click event on valid node.")
|
minetest.log("verbose", "[mcl_signs] Standing_Sign Right Click event on valid node.")
|
||||||
|
|
Loading…
Reference in a new issue