Merge branch 'master' into formspec-v4

This commit is contained in:
AFCMS 2021-05-03 23:25:59 +02:00
commit e28f7e1ee9
9 changed files with 12 additions and 6 deletions

View File

@ -1,3 +1,5 @@
# (Currently in feature freeze)
# MineClone 2
An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
Developed by many people. Not developed or endorsed by Mojang AB.

View File

@ -1515,9 +1515,9 @@ local is_at_water_danger = function(self)
end
local function get_light(pos, tod)
if minetest.get_node_or_nil(pos) then
local lightfunc = minetest.get_natural_light or minetest.get_node_light
return lightfunc(pos, tod)
local ok, light = pcall(minetest.get_natural_light or minetest.get_node_light, pos, tod)
if ok then
return light
else
return 0
end

View File

@ -28,6 +28,7 @@ Pig=Schwein
Polar Bear=Eisbär
Rabbit=Kaninchen
Killer Bunny=Killerkaninchen
The Killer Bunny=Das Killerkaninchen
Sheep=Schaf
Shulker=Shulker
Silverfish=Silberfischchen

View File

@ -28,6 +28,7 @@ Pig=Cerdo
Polar Bear=Oso polar
Rabbit=Conejo
Killer Bunny=Conejo asesino
The Killer Bunny=El Conejo asesino
Sheep=Oveja
Shulker=Shulker
Silverfish=Lepisma

View File

@ -28,6 +28,7 @@ Pig=Cochon
Polar Bear=Ours blanc
Rabbit=Lapin
Killer Bunny=Lapin tueur
The Killer Bunny=Le Lapin tueur
Sheep=Mouton
Shulker=Shulker
Silverfish=Poisson d'argent

View File

@ -28,6 +28,7 @@ Pig=Свинья
Polar Bear=Полярный медведь
Rabbit=Кролик
Killer Bunny=Кролик-убийца
The Killer Bunny=Кролик-убийца
Sheep=Овца
Shulker=Шалкер
Silverfish=Чешуйница

View File

@ -99,7 +99,7 @@ killer_bunny.on_rightclick = nil
killer_bunny.run_velocity = 6
killer_bunny.do_custom = function(self)
if not self._killer_bunny_nametag_set then
self.nametag = "The Killer Bunny"
self.nametag = S("The Killer Bunny")
self._killer_bunny_nametag_set = true
end
end

View File

@ -263,7 +263,7 @@ function mcl_experience.add_experience(player, experience)
local can = final_candidates[math.random(#final_candidates)]
local stack, list, index, wear = can.stack, can.list, can.index, can.wear
local unbreaking_level = mcl_enchanting.get_enchantment(stack, "unbreaking")
local uses = mcl_util.calculate_durability(itemstack)
local uses = mcl_util.calculate_durability(stack)
local multiplier = 2 * 65535 / uses
local repair = experience * multiplier
local new_wear = wear - repair

View File

@ -689,7 +689,7 @@ function mcl_potions.healing_func(player, hp)
hp = -1
end
mcl_util.deal_damage(obj, -hp, {type = "magic"})
mcl_util.deal_damage(player, -hp, {type = "magic"})
end
end