mirror of
https://git.minetest.land/Mineclonia/Mineclonia.git
synced 2024-11-23 19:15:09 +00:00
Merge pull request 'Make the server not crash when players are killed by named mobs' (#19) from fix_server_crash_when_player_killed_by_named_mob into master
Reviewed-on: https://git.minetest.land/Mineclonia/Mineclonia/pulls/19
This commit is contained in:
commit
0761ad0964
1 changed files with 4 additions and 1 deletions
|
@ -41,6 +41,9 @@ local msgs = {
|
|||
["murder"] = {
|
||||
N("@1 was slain by @2 using [@3]"),
|
||||
},
|
||||
["murder_by_named_mob"] = {
|
||||
N("@1 was slain by @2."),
|
||||
},
|
||||
["murder_any"] = {
|
||||
N("@1 was killed."),
|
||||
},
|
||||
|
@ -212,7 +215,7 @@ minetest.register_on_dieplayer(function(player, reason)
|
|||
end
|
||||
hittersubtype = hitter:get_luaentity().name
|
||||
if hittername then
|
||||
msg = dmsg("murder", name, hittername)
|
||||
msg = dmsg("murder_by_named_mob", name, hittername)
|
||||
elseif hittersubtype ~= nil and hittersubtype ~= "" then
|
||||
msg = mmsg(hittersubtype, name)
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue