Merge master into testing

This commit is contained in:
kay27 2021-12-31 02:34:34 +04:00
commit cd3f9bc40f
4 changed files with 9 additions and 1 deletions

View File

@ -19,6 +19,8 @@ mobs:register_mob("mobs_mc:iron_golem", {
rotate = 270, rotate = 270,
hp_min = 100, hp_min = 100,
hp_max = 100, hp_max = 100,
xp_min = 0,
xp_max = 0,
protect = true, protect = true,
neutral = true, neutral = true,
breath_max = -1, breath_max = -1,

View File

@ -27,6 +27,8 @@ mobs:register_mob("mobs_mc:snowman", {
passive = true, passive = true,
hp_min = 4, hp_min = 4,
hp_max = 4, hp_max = 4,
xp_min = 0,
xp_max = 0,
pathfinding = 1, pathfinding = 1,
view_range = 10, view_range = 10,
fall_damage = 0, fall_damage = 0,

View File

@ -419,6 +419,10 @@ function ARROW_ENTITY.on_step(self, dtime)
self.object:set_rotation({ x = 0, y = yaw, z = pitch }) self.object:set_rotation({ x = 0, y = yaw, z = pitch })
end end
if self._in_player and not self.object:get_attach() then
self.object:remove()
end
-- Update internal variable -- Update internal variable
self._lastpos={x=pos.x, y=pos.y, z=pos.z} self._lastpos={x=pos.x, y=pos.y, z=pos.z}
end end

View File

@ -181,7 +181,7 @@ S("The speed and damage of the arrow increases the longer you charge. The regula
itemstack:get_meta():set_string("active", "true") itemstack:get_meta():set_string("active", "true")
return itemstack return itemstack
end, end,
groups = {weapon=1,weapon_ranged=1,crossbow=1,enchantability=1}, groups = {not_in_creative_inventory=1,weapon=1,weapon_ranged=1,crossbow=1,enchantability=1},
_mcl_uses = 326, _mcl_uses = 326,
}) })