Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

respect areas setting #75

Merged
merged 2 commits into from
Oct 4, 2024
Merged

respect areas setting #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
121ade1
respect areas setting
SwissalpS Sep 17, 2024
c6699ae
de duplicate code
SwissalpS Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions areas.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@ end
-- protection check
local old_is_protected = minetest.is_protected
function minetest.is_protected(pos, name)
if areas.getSmallestAreaAtPos then
local area_list
if areas.config.use_smallest_area_precedence then
local _, id = areas:getSmallestAreaAtPos(pos)
local xp_area = id and xp_areas[id]
area_list = id and { [id] = true } or {}
else
area_list = areas:getAreasAtPos(pos)
end
for id in pairs(area_list) do
local xp_area = xp_areas[id]

if xp_area then
local xp = xp_redo.get_xp(name)
if xp_area.min and xp < xp_area.min then
Expand All @@ -20,20 +27,6 @@ function minetest.is_protected(pos, name)
return true
end
end
else
local area_list = areas:getAreasAtPos(pos)
for id in pairs(area_list) do
local xp_area = xp_areas[id]

if xp_area then
local xp = xp_redo.get_xp(name)
if xp_area.min and xp < xp_area.min then
return true
elseif xp_area.max and xp > xp_area.max then
return true
end
end
end
end

return old_is_protected(pos, name)
Expand Down