Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2023-12-13 21:01:04 +01:00
commit 7893b94f6e
2 changed files with 7 additions and 6 deletions

View File

@ -309,12 +309,11 @@ mobs:register_arrow("mobs_monster:obsidian_arrow", {
end
local texture = "default_dirt.png" --fallback texture
local radius = 1
local def = minetest.registered_nodes[node]
local def = node and minetest.registered_nodes[node.name]
if def then
node = {name = node}
if not def then
return
end
if def and def.tiles and def.tiles[1] then
@ -350,6 +349,6 @@ mobs:register_arrow("mobs_monster:obsidian_arrow", {
local snd = def.sounds and def.sounds.dug or "default_dig_crumbly"
minetest.sound_play(snd, {pos = pos, max_hear_distance = 12, gain = 1.0}, true)
minetest.sound_play(snd, {pos = pos, max_hear_distance = 8, gain = 1.0}, true)
end
})

View File

@ -204,7 +204,9 @@ mobs:register_mob("mobs_monster:spider", {
-- move up facing
v.x = 0 ; v.y = 0
v.y = self.jump_height
mobs:set_animation(self, "jump")
self:set_animation("jump")
self.object:set_velocity(v)
end,