GuyLiner
/
MineClone5
forked from MineClone5/MineClone5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/production'

This commit is contained in:
kay27 2022-01-03 20:15:42 +04:00
parent 6a323c376a 219981081b
commit 7464a4721d
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mods/ENTITIES/mcl_mobs/api/mob_functions/movement.lua
View File

@ -43,6 +43,11 @@ mobs.float = function(self)
self.object:set_acceleration({x=0, y=0, z=0}) self.object:set_acceleration({x=0, y=0, z=0})
end end
if self.jump_only then
self.object:set_acceleration({x=acceleration.x, y=-5, z=acceleration.z})
return
end
local current_velocity = self.object:get_velocity() local current_velocity = self.object:get_velocity()
local new_velocity_addition = DEFAULT_FLOAT_SPEED - current_velocity.y local new_velocity_addition = DEFAULT_FLOAT_SPEED - current_velocity.y

6
mods/ENVIRONMENT/mcl_weather/nether_dust.lua
View File

@ -21,14 +21,14 @@ local psdef= {
} }
local function check_player(player) local function check_player(player)
local name=player:get_player_name(name) local name=player:get_player_name(player)
if mcl_worlds.has_dust(player:get_pos()) and not mcl_weather.nether_dust.particlespawners[name] then if mcl_worlds.has_dust(player:get_pos()) and not mcl_weather.nether_dust.particlespawners[name] then
return true return true
end end
end end
mcl_weather.nether_dust.add_particlespawners = function(player) mcl_weather.nether_dust.add_particlespawners = function(player)
local name=player:get_player_name(name) local name=player:get_player_name(player)
mcl_weather.nether_dust.particlespawners[name]={} mcl_weather.nether_dust.particlespawners[name]={}
psdef.playername = name psdef.playername = name
psdef.attached = player psdef.attached = player
@ -40,7 +40,7 @@ mcl_weather.nether_dust.add_particlespawners = function(player)
end end
mcl_weather.nether_dust.delete_particlespawners = function(player) mcl_weather.nether_dust.delete_particlespawners = function(player)
local name=player:get_player_name(name) local name=player:get_player_name(player)
if mcl_weather.nether_dust.particlespawners[name] then if mcl_weather.nether_dust.particlespawners[name] then
for i=1,3 do for i=1,3 do
minetest.delete_particlespawner(mcl_weather.nether_dust.particlespawners[name][i]) minetest.delete_particlespawner(mcl_weather.nether_dust.particlespawners[name][i])

8
mods/ITEMS/mcl_buckets/init.lua
View File

@ -186,8 +186,12 @@ function mcl_buckets.register_liquid(def)
local undernode = get_node(pointed_thing.under) local undernode = get_node(pointed_thing.under)
local abovenode = get_node(pointed_thing.above) local abovenode = get_node(pointed_thing.above)
local buildable1 = minetest.registered_nodes[undernode.name] and minetest.registered_nodes[undernode.name].buildable_to local name1, name2 = undernode.name, abovenode.name
local buildable2 = minetest.registered_nodes[abovenode.name] and minetest.registered_nodes[abovenode.name].buildable_to local regnode1, regnode2 = minetest.registered_nodes[name1], minetest.registered_nodes[name2]
local buildable1 = regnode1 and (regnode1.buildable_to or regnode1.groups.cauldron == 1)
local buildable2 = regnode2 and (regnode2.buildable_to or regnode2.groups.cauldron == 1)
if not buildable1 and not buildable2 then return itemstack end --if both nodes aren't buildable_to, skip if not buildable1 and not buildable2 then return itemstack end --if both nodes aren't buildable_to, skip
if buildable1 then if buildable1 then