mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-12-01 23:11:11 +01:00
Allow spawning on water
This commit is contained in:
parent
b067111e71
commit
93cccaa264
1 changed files with 3 additions and 10 deletions
|
@ -610,16 +610,12 @@ local function has_summon_participants(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function summon_golem(self)
|
local function summon_golem(self)
|
||||||
self._summon_locked = true
|
|
||||||
vector.offset(self.object:get_pos(),-10,-10,-10)
|
vector.offset(self.object:get_pos(),-10,-10,-10)
|
||||||
local nn = minetest.find_nodes_in_area_under_air(vector.offset(self.object:get_pos(),-10,-10,-10),vector.offset(self.object:get_pos(),10,10,10),{"group:solid"})
|
local nn = minetest.find_nodes_in_area_under_air(vector.offset(self.object:get_pos(),-10,-10,-10),vector.offset(self.object:get_pos(),10,10,10),{"group:solid","group:water"})
|
||||||
|
table.shuffle(nn)
|
||||||
for _,n in pairs(nn) do
|
for _,n in pairs(nn) do
|
||||||
local up = minetest.find_nodes_in_area(vector.offset(n,0,1,0),vector.offset(n,0,3,0),{"air"})
|
local up = minetest.find_nodes_in_area(vector.offset(n,0,1,0),vector.offset(n,0,3,0),{"air"})
|
||||||
if up and #up >= 3 then
|
if up and #up >= 3 then
|
||||||
for _,o in pairs(minetest.get_objects_inside_radius(self.object:get_pos(),10)) do
|
|
||||||
local l = o:get_luaentity()
|
|
||||||
if l and l.name == "mobs_mc:villager" then l._summon_locked = true end
|
|
||||||
end
|
|
||||||
minetest.sound_play("mcl_portals_open_end_portal", {pos=n, gain=0.5, max_hear_distance = 16}, true)
|
minetest.sound_play("mcl_portals_open_end_portal", {pos=n, gain=0.5, max_hear_distance = 16}, true)
|
||||||
return minetest.add_entity(vector.offset(n,0,1,0),"mobs_mc:iron_golem")
|
return minetest.add_entity(vector.offset(n,0,1,0),"mobs_mc:iron_golem")
|
||||||
end
|
end
|
||||||
|
@ -631,10 +627,7 @@ local function check_summon(self,dtime)
|
||||||
if self._summon_timer and self._summon_timer > 30 then
|
if self._summon_timer and self._summon_timer > 30 then
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
self._summon_timer = 0
|
self._summon_timer = 0
|
||||||
self._summon_locked = nil
|
if has_golem(pos) then return false end
|
||||||
self._has_golem = self._has_golem or has_golem(pos)
|
|
||||||
if self._has_golem then return false end
|
|
||||||
if self._summon_locked then return false end
|
|
||||||
if not has_summon_participants(self) then return end
|
if not has_summon_participants(self) then return end
|
||||||
summon_golem(self)
|
summon_golem(self)
|
||||||
elseif self._summon_timer == nil then
|
elseif self._summon_timer == nil then
|
||||||
|
|
Loading…
Reference in a new issue