mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-08-19 21:44:12 +02:00
Merge pull request 'Lightning command: Strike player by name' (#2326) from MrRar/MineClone2:lightning into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2326 Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com> Reviewed-by: cora <cora@noreply.git.minetest.land>
This commit is contained in:
commit
87bf3fdc0d
@ -238,8 +238,8 @@ after(5, function(dtime)
|
||||
end)
|
||||
|
||||
minetest.register_chatcommand("lightning", {
|
||||
params = "[<X> <Y> <Z>]",
|
||||
description = S("Let lightning strike at the specified position or yourself"),
|
||||
params = "[<X> <Y> <Z> | <player name>]",
|
||||
description = S("Let lightning strike at the specified position or player. No parameter will strike yourself."),
|
||||
privs = { maphack = true },
|
||||
func = function(name, param)
|
||||
local pos = {}
|
||||
@ -247,21 +247,21 @@ minetest.register_chatcommand("lightning", {
|
||||
pos.x = tonumber(pos.x)
|
||||
pos.y = tonumber(pos.y)
|
||||
pos.z = tonumber(pos.z)
|
||||
local player_to_strike
|
||||
if not (pos.x and pos.y and pos.z) then
|
||||
pos = nil
|
||||
player_to_strike = minetest.get_player_by_name(param)
|
||||
if not player_to_strike and param == "" then
|
||||
player_to_strike = minetest.get_player_by_name(name)
|
||||
end
|
||||
end
|
||||
if name == "" and pos == nil then
|
||||
if not player_to_strike and pos == nil then
|
||||
return false, "No position specified and unknown player"
|
||||
end
|
||||
if pos then
|
||||
lightning.strike(pos)
|
||||
else
|
||||
local player = minetest.get_player_by_name(name)
|
||||
if player then
|
||||
lightning.strike(player:get_pos())
|
||||
else
|
||||
return false, S("No position specified and unknown player")
|
||||
end
|
||||
elseif player_to_strike then
|
||||
lightning.strike(player_to_strike:get_pos())
|
||||
end
|
||||
return true
|
||||
end,
|
||||
|
@ -1,4 +1,3 @@
|
||||
# textdomain: lightning
|
||||
@1 was struck by lightning.=
|
||||
Let lightning strike at the specified position or yourself=
|
||||
Let lightning strike at the specified position or player. No parameter will strike yourself.=
|
||||
No position specified and unknown player=
|
||||
|
Loading…
Reference in New Issue
Block a user