Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-16 16:11:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash with splash potions of harming, make splash particles match potion color

Browse source
This commit is contained in:
teknomunk 2024-09-07 21:47:44 -05:00
parent 0ff20a8a95
commit 3f4b8cd27c
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mods/ITEMS/mcl_potions/splash.lua
View file

@ -92,7 +92,7 @@ function mcl_potions.register_splash(name, descr, color, def)
end end
particle_texture = particle_texture.."^[colorize:"..color..":127" particle_texture = particle_texture.."^[colorize:"..color..":127"
local function make_particles(pos) local function splash_effects(self, pos, def, range)
minetest.add_particlespawner({ minetest.add_particlespawner({
amount = 50, amount = 50,
time = 0.1, time = 0.1,
@ -110,10 +110,6 @@ function mcl_potions.register_splash(name, descr, color, def)
vertical = false, vertical = false,
texture = particle_texture, texture = particle_texture,
}) })
end
function splash_effects(self, pos, def, range)
make_particles(pos)
for _,obj in pairs(minetest.get_objects_inside_radius(pos, range)) do for _,obj in pairs(minetest.get_objects_inside_radius(pos, range)) do
-- Make sure the potion can interact with this object -- Make sure the potion can interact with this object
@ -160,7 +156,7 @@ function mcl_potions.register_splash(name, descr, color, def)
if def.custom_effect then if def.custom_effect then
local power = (potency+1) * mcl_potions.SPLASH_FACTOR local power = (potency+1) * mcl_potions.SPLASH_FACTOR
if rad > 0 then if rad > 0 then
def.custom_effect(obj, redux_map[rad] * power, plus) def.custom_effect(obj, REDUX_MAP[rad] * power, plus)
else else
def.custom_effect(obj, power, plus) def.custom_effect(obj, power, plus)
end end