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

Fix crash when dying cuz fire, lava or magmablock

This commit is contained in:
Wuzzy 2019-03-15 07:10:18 +01:00
parent 81ca79e85c
commit 661e10e992
8 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/ITEMS/mcl_core/locale/mcl_core.de.tr
View File

@ -1,8 +1,8 @@
# textdomain: mcl_core # textdomain: mcl_core
%s could not survive in lava.=%s konnte nicht in Lava überleben. @1 could not survive in lava.=@1 konnte nicht in Lava überleben.
%s died in lava.=%s starb in Lava. @1 died in lava.=@1 starb in Lava.
%s melted in lava.=%s schmolz in der Lava. @1 melted in lava.=@1 schmolz in der Lava.
%s took a bath in a hot lava tub.=%s nahm ein Bad in einer heißen Lavawanne. @1 took a bath in a hot lava tub.=@1 nahm ein Bad in einer heißen Lavawanne.
A block of diamond is mostly a shiny decorative block but also useful as a compact storage of diamonds.=Ein Diamantblock ist hauptsächlich ein glänzender Dekorationsblock, aber er ist auch nützlich zur kompakten Aufbewahrung von Diamanten. A block of diamond is mostly a shiny decorative block but also useful as a compact storage of diamonds.=Ein Diamantblock ist hauptsächlich ein glänzender Dekorationsblock, aber er ist auch nützlich zur kompakten Aufbewahrung von Diamanten.
A block of emerald is mostly a shiny decorative block but also useful as a compact storage of emeralds.=Ein Smaragdblock ist hauptsächlich ein glänzender Dekorationsblock, aber er ist auch nützlich zur kompakten Aufbewahrung von Smaragden. A block of emerald is mostly a shiny decorative block but also useful as a compact storage of emeralds.=Ein Smaragdblock ist hauptsächlich ein glänzender Dekorationsblock, aber er ist auch nützlich zur kompakten Aufbewahrung von Smaragden.
A block of gold is mostly a shiny decorative block but also useful as a compact storage of gold ingots.=Ein Goldblock ist hauptsächlich ein glänzender Dekorationsblock, aber er ist auch nützlich zur kompakten Aufbewahrung von Goldbarren. A block of gold is mostly a shiny decorative block but also useful as a compact storage of gold ingots.=Ein Goldblock ist hauptsächlich ein glänzender Dekorationsblock, aber er ist auch nützlich zur kompakten Aufbewahrung von Goldbarren.

8
mods/ITEMS/mcl_core/locale/template.tr
View File

@ -1,8 +1,8 @@
# textdomain: mcl_core # textdomain: mcl_core
%s could not survive in lava.= @1 could not survive in lava.=
%s died in lava.= @1 died in lava.=
%s melted in lava.= @1 melted in lava.=
%s took a bath in a hot lava tub.= @1 took a bath in a hot lava tub.=
A block of diamond is mostly a shiny decorative block but also useful as a compact storage of diamonds.= A block of diamond is mostly a shiny decorative block but also useful as a compact storage of diamonds.=
A block of emerald is mostly a shiny decorative block but also useful as a compact storage of emeralds.= A block of emerald is mostly a shiny decorative block but also useful as a compact storage of emeralds.=
A block of gold is mostly a shiny decorative block but also useful as a compact storage of gold ingots.= A block of gold is mostly a shiny decorative block but also useful as a compact storage of gold ingots.=

9
mods/ITEMS/mcl_core/nodes_liquid.lua
View File

@ -1,16 +1,17 @@
-- Liquids: Water and lava -- Liquids: Water and lava
local S = minetest.get_translator("mcl_core") local S = minetest.get_translator("mcl_core")
local N = function(s) return s end
local WATER_ALPHA = 179 local WATER_ALPHA = 179
local WATER_VISC = 1 local WATER_VISC = 1
local LAVA_VISC = 7 local LAVA_VISC = 7
local lava_death_messages = { local lava_death_messages = {
S("%s melted in lava."), N("@1 melted in lava."),
S("%s took a bath in a hot lava tub."), N("@1 took a bath in a hot lava tub."),
S("%s died in lava."), N("@1 died in lava."),
S("%s could not survive in lava."), N("@1 could not survive in lava."),
} }
minetest.register_node("mcl_core:water_flowing", { minetest.register_node("mcl_core:water_flowing", {

9
mods/ITEMS/mcl_fire/init.lua
View File

@ -3,6 +3,7 @@
mcl_fire = {} mcl_fire = {}
local S = minetest.get_translator("mcl_fire") local S = minetest.get_translator("mcl_fire")
local N = function(s) return s end
-- --
-- Items -- Items
@ -39,10 +40,10 @@ end
local eternal_fire_help = S("Eternal fire is a damaging block that might create more fire. It will create fire around it when flammable blocks are nearby. Eternal fire can be extinguished by punches and nearby water blocks. Other than (normal) fire, eternal fire does not get extinguished on its own and also continues to burn under rain. Punching eternal fire is safe, but it hurts if you stand inside.") local eternal_fire_help = S("Eternal fire is a damaging block that might create more fire. It will create fire around it when flammable blocks are nearby. Eternal fire can be extinguished by punches and nearby water blocks. Other than (normal) fire, eternal fire does not get extinguished on its own and also continues to burn under rain. Punching eternal fire is safe, but it hurts if you stand inside.")
local fire_death_messages = { local fire_death_messages = {
S("%s has been cooked crisp."), N("@1 has been cooked crisp."),
S("%s felt the burn."), N("@1 felt the burn."),
S("%s died in the flames."), N("@1 died in the flames."),
S("%s died in a fire."), N("@1 died in a fire."),
} }
minetest.register_node("mcl_fire:fire", { minetest.register_node("mcl_fire:fire", {

8
mods/ITEMS/mcl_fire/locale/mcl_fire.de.tr
View File

@ -8,9 +8,9 @@ Rightclick the surface of a block to attempt to light a fire in front of it or i
Fire is a damaging and destructive but short-lived kind of block. It will destroy and spread towards near flammable blocks, but fire will disappear when there is nothing to burn left. It will be extinguished by nearby water and rain. Fire can be destroyed safely by punching it, but it is hurtful if you stand directly in it. If a fire is started above netherrack or a magma block, it will immediately turn into an eternal fire.=Feuer ist ein schädlicher und destruktiver aber kurzlebiger Block. Es wird sich zu entzündlichen Blöcken ausbreiten und sie zerstören, aber Feuer wird verschwinden, wenn es nichts brennbares mehr gibt. Es wird von Wasser und Regen gelöscht. Feuer kann sicher mit einem Schlag zerstört werden, aber es tut weh, wenn man direkt in ihm steht. Wird ein Feuer über Netherrack oder einem Magmablock entfacht, wird er sich sofort zu einem ewigen Feuer verwandeln. Fire is a damaging and destructive but short-lived kind of block. It will destroy and spread towards near flammable blocks, but fire will disappear when there is nothing to burn left. It will be extinguished by nearby water and rain. Fire can be destroyed safely by punching it, but it is hurtful if you stand directly in it. If a fire is started above netherrack or a magma block, it will immediately turn into an eternal fire.=Feuer ist ein schädlicher und destruktiver aber kurzlebiger Block. Es wird sich zu entzündlichen Blöcken ausbreiten und sie zerstören, aber Feuer wird verschwinden, wenn es nichts brennbares mehr gibt. Es wird von Wasser und Regen gelöscht. Feuer kann sicher mit einem Schlag zerstört werden, aber es tut weh, wenn man direkt in ihm steht. Wird ein Feuer über Netherrack oder einem Magmablock entfacht, wird er sich sofort zu einem ewigen Feuer verwandeln.
Fire is a damaging but non-destructive short-lived kind of block. It will disappear when there is no flammable block around. Fire does not destroy blocks, at least not in this world. It will be extinguished by nearby water and rain. Fire can be destroyed safely by punching it, but it is hurtful if you stand directly in it. If a fire is started above netherrack or a magma block, it will immediately turn into an eternal fire.=Feuer ist ein schädlicher aber nicht-destruktiver kurzlebiger Block. Es wird verschwinden, wenn sich keine entzündlichen Blöcke in der Nähe befinden. Feuer breitet sich nicht aus und zerstört keine Blöcke, zumindest nicht in dieser Welt. Es wird von Wasser und Regen gelöscht. Feuer kann sicher mit einem Schlag zerstört werden, aber es tut weh, wenn man direkt in ihm steht. Wird ein Feuer über Netherrack oder einem Magmablock entfacht, wird er sich sofort zu einem ewigen Feuer verwandeln. Fire is a damaging but non-destructive short-lived kind of block. It will disappear when there is no flammable block around. Fire does not destroy blocks, at least not in this world. It will be extinguished by nearby water and rain. Fire can be destroyed safely by punching it, but it is hurtful if you stand directly in it. If a fire is started above netherrack or a magma block, it will immediately turn into an eternal fire.=Feuer ist ein schädlicher aber nicht-destruktiver kurzlebiger Block. Es wird verschwinden, wenn sich keine entzündlichen Blöcke in der Nähe befinden. Feuer breitet sich nicht aus und zerstört keine Blöcke, zumindest nicht in dieser Welt. Es wird von Wasser und Regen gelöscht. Feuer kann sicher mit einem Schlag zerstört werden, aber es tut weh, wenn man direkt in ihm steht. Wird ein Feuer über Netherrack oder einem Magmablock entfacht, wird er sich sofort zu einem ewigen Feuer verwandeln.
Eternal fire is a damaging block that might create more fire. It will create fire around it when flammable blocks are nearby. Eternal fire can be extinguished by punches and nearby water blocks. Other than (normal) fire, eternal fire does not get extinguished on its own and also continues to burn under rain. Punching eternal fire is safe, but it hurts if you stand inside.=Ewiges Feuer ist ein schädlicher Block, der mehr Feuer machen kann. Er wird um sich Feuer machen, wenn entflammbare Blöcke in der Nähe sind. Ewiges Feuer kann von Schlägen und Wasserblöcken in der Nähe gelöscht werden. Anders als (normales) Feuer geht ein ewiges Fuer nicht von alleine aus, auf nicht unter Regen. Es ist sicher, ein ewiges Feuer zu schlagen, aber es tut weh, wenn man direkt in einem steht. Eternal fire is a damaging block that might create more fire. It will create fire around it when flammable blocks are nearby. Eternal fire can be extinguished by punches and nearby water blocks. Other than (normal) fire, eternal fire does not get extinguished on its own and also continues to burn under rain. Punching eternal fire is safe, but it hurts if you stand inside.=Ewiges Feuer ist ein schädlicher Block, der mehr Feuer machen kann. Er wird um sich Feuer machen, wenn entflammbare Blöcke in der Nähe sind. Ewiges Feuer kann von Schlägen und Wasserblöcken in der Nähe gelöscht werden. Anders als (normales) Feuer geht ein ewiges Fuer nicht von alleine aus, auf nicht unter Regen. Es ist sicher, ein ewiges Feuer zu schlagen, aber es tut weh, wenn man direkt in einem steht.
%s has been cooked crisp.=%s wurde knusprig gebraten. @1 has been cooked crisp.=@1 wurde knusprig gebraten.
%s felt the burn.=%s ist völlig verbrannt. @1 felt the burn.=@1 ist völlig verbrannt.
%s died in the flames.=%s starb in den Flammen. @1 died in the flames.=@1 starb in den Flammen.
%s died in a fire.=%s starb in einem Feuer. @1 died in a fire.=@1 starb in einem Feuer.
Fire=Feuer Fire=Feuer
Eternal Fire=Ewiges Feuer Eternal Fire=Ewiges Feuer

8
mods/ITEMS/mcl_fire/locale/template.txt
View File

@ -8,9 +8,9 @@ Rightclick the surface of a block to attempt to light a fire in front of it or i
Fire is a damaging and destructive but short-lived kind of block. It will destroy and spread towards near flammable blocks, but fire will disappear when there is nothing to burn left. It will be extinguished by nearby water and rain. Fire can be destroyed safely by punching it, but it is hurtful if you stand directly in it. If a fire is started above netherrack or a magma block, it will immediately turn into an eternal fire.= Fire is a damaging and destructive but short-lived kind of block. It will destroy and spread towards near flammable blocks, but fire will disappear when there is nothing to burn left. It will be extinguished by nearby water and rain. Fire can be destroyed safely by punching it, but it is hurtful if you stand directly in it. If a fire is started above netherrack or a magma block, it will immediately turn into an eternal fire.=
Fire is a damaging but non-destructive short-lived kind of block. It will disappear when there is no flammable block around. Fire does not destroy blocks, at least not in this world. It will be extinguished by nearby water and rain. Fire can be destroyed safely by punching it, but it is hurtful if you stand directly in it. If a fire is started above netherrack or a magma block, it will immediately turn into an eternal fire.= Fire is a damaging but non-destructive short-lived kind of block. It will disappear when there is no flammable block around. Fire does not destroy blocks, at least not in this world. It will be extinguished by nearby water and rain. Fire can be destroyed safely by punching it, but it is hurtful if you stand directly in it. If a fire is started above netherrack or a magma block, it will immediately turn into an eternal fire.=
Eternal fire is a damaging block that might create more fire. It will create fire around it when flammable blocks are nearby. Eternal fire can be extinguished by punches and nearby water blocks. Other than (normal) fire, eternal fire does not get extinguished on its own and also continues to burn under rain. Punching eternal fire is safe, but it hurts if you stand inside.= Eternal fire is a damaging block that might create more fire. It will create fire around it when flammable blocks are nearby. Eternal fire can be extinguished by punches and nearby water blocks. Other than (normal) fire, eternal fire does not get extinguished on its own and also continues to burn under rain. Punching eternal fire is safe, but it hurts if you stand inside.=
%s has been cooked crisp.= @1 has been cooked crisp.=
%s felt the burn.= @1 felt the burn.=
%s died in the flames.= @1 died in the flames.=
%s died in a fire.= @1 died in a fire.=
Fire= Fire=
Eternal Fire= Eternal Fire=

2
mods/ITEMS/mcl_nether/init.lua
View File

@ -94,7 +94,7 @@ minetest.register_node("mcl_nether:magma", {
-- Hurt players standing on top of this block -- Hurt players standing on top of this block
if player:get_hp() > 0 then if player:get_hp() > 0 then
if mod_death_messages then if mod_death_messages then
mcl_death_messages.player_damage(player, string.format("%s stood too long on a magma block.", player:get_player_name())) mcl_death_messages.player_damage(player, S("@1 stood too long on a magma block.", player:get_player_name()))
end end
player:set_hp(player:get_hp() - 1) player:set_hp(player:get_hp() - 1)
end end

1
mods/ITEMS/mcl_nether/locale/template.txt
View File

@ -25,3 +25,4 @@ Nether Brick=
Nether bricks are the main crafting ingredient for crafting nether brick blocks and nether fences.= Nether bricks are the main crafting ingredient for crafting nether brick blocks and nether fences.=
Nether Lava Source= Nether Lava Source=
Flowing Nether Lava= Flowing Nether Lava=
@1 stood too long on a magma block.=