mirror of
https://github.com/minetest-mods/technic.git
synced 2024-11-10 20:40:27 +01:00
merge weirdness conflict
This commit is contained in:
commit
88d9e92f18
|
@ -66,16 +66,6 @@ local function forceload_on_flposes(want_flposes, meta)
|
||||||
end
|
end
|
||||||
technic.forceload_on_flposes = forceload_on_flposes
|
technic.forceload_on_flposes = forceload_on_flposes
|
||||||
|
|
||||||
-- computes the forceload positions (using compute_forceload_positions) and tries to force load all of them, and records them in meta "forceloaded"
|
|
||||||
-- pos - position of the anchor node
|
|
||||||
-- meta - contains "radius" (to be read) and "forceloaded" (to be written)
|
|
||||||
local function forceload_on(pos, meta)
|
|
||||||
local want_flposes = compute_forceload_positions(pos, meta)
|
|
||||||
forceload_on_flposes(want_flposes, meta)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
technic.forceload_on_flposes = forceload_on_flposes
|
|
||||||
|
|
||||||
-- computes the forceload positions (using compute_forceload_positions) and tries to force load all of them, and records them in meta "forceloaded"
|
-- computes the forceload positions (using compute_forceload_positions) and tries to force load all of them, and records them in meta "forceloaded"
|
||||||
-- pos - position of the anchor node
|
-- pos - position of the anchor node
|
||||||
-- meta - contains "radius" (to be read) and "forceloaded" (to be written)
|
-- meta - contains "radius" (to be read) and "forceloaded" (to be written)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user