Skip to content

Commit

Permalink
Merge pull request #15 from taylorskalyo/upstream
Browse files Browse the repository at this point in the history
Upstream pull
  • Loading branch information
BuckarooBanzay authored Mar 1, 2024
2 parents a943d77 + 5a6e4d9 commit 6f50e65
Show file tree
Hide file tree
Showing 34 changed files with 836 additions and 1,640 deletions.
2 changes: 2 additions & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@ read_globals = {
"mesecon",
"screwdriver",
"lucky_block",
"mcl_formspec",
"mcl_sounds",
"factions"
}
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ Change log:
- 2.9 - Added MineClone2 recipes for protection block but no official support as yet
- 3.0 - Added PlayerFactions support, 'protector_hud_interval' setting and listing in advanced settings for mod values.
- 3.1 - Ability to hide protection blocks using /protector_hide and /protector_show , italian local added (thanks Hamlet)
- 3.2 - Defaults to Minetest translation if found, otherwise intllib fallback if loaded, locale files updated for both. Added 'protector_msg' setting for player text.
- 3.3 - Added support for playerfactions new api (thanks louisroyer), added limiter to protection radius of 22.
- 3.4 - Player flip and hurt functions moved to minetest.register_protection_violation function (thanks hlqkj), added 'protector_crafts' setting, changed wood doors n chests to immediate_dig for mineclone2 fix.

Lucky Blocks: 10

Expand Down Expand Up @@ -128,6 +131,12 @@ protector_flip = true
protector_show_interval
- Number of seconds the protection field is visible, defaults to 5 seconds.

protector_recipe = true
- When true allows players to craft protection blocks

protector_msg = true
- When true shows protection messages in players chat when trying to interact in someone else's area


Protector Tool

Expand Down
10 changes: 5 additions & 5 deletions admin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ minetest.register_chatcommand("protector_remove", {
end

removal_names = param
end,
end
})


Expand Down Expand Up @@ -63,13 +63,13 @@ minetest.register_chatcommand("protector_replace", {
end

replace_names = param
end,
end
})


minetest.register_abm({
nodenames = {"protector:protect", "protector:protect2", "protector:protect_hidden"},
interval = 8,
interval = 6,
chance = 1,
catch_up = false,
action = function(pos, node)
Expand Down Expand Up @@ -164,8 +164,8 @@ minetest.register_node("protector:protect_hidden", {
-- 1px block inside door hinge near node top
collision_box = {
type = "fixed",
fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32},
},
fixed = {-15/32, 13/32, -15/32, -13/32, 1/2, -13/32}
}
})


Expand Down
5 changes: 0 additions & 5 deletions depends.txt

This file was deleted.

1 change: 0 additions & 1 deletion description.txt

This file was deleted.

Loading

0 comments on commit 6f50e65

Please sign in to comment.