Skip to content

Fix nil vehicle controller and redundant function calls in deathmessages #742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iManGaaX wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix nil vehicle controller and redundant function calls in deathmessages #742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions [gameplay]/deathmessages/deathmessages.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
addEventHandler("onPlayerWasted", root,
function (ammo, killer, weapon, bodypart)
local r, g, b = getColorFromString(string.upper(get("color")))
local r, g, b = getColorFromString(string.upper(get("color") or "#ffaa00"))
local message
if killer then
if killer ~= source then
local killerType = getElementType(killer)
if killerType == "player" then
message = getPlayerName(killer).." killed "..getPlayerName(source).."."
elseif killerType == "vehicle" then
message = getPlayerName(getVehicleController(killer)).." killed "..getPlayerName(source).."."
local controller = getVehicleController(killer)
if controller then
message = getPlayerName(controller).." killed "..getPlayerName(source).."."
else
message = "A vehicle killed "..getPlayerName(source).."."
end

if get("show_vehiclename") then
message = message .. " ("..getVehicleName(killer)..")"
end
Expand All @@ -29,7 +35,7 @@ addEventHandler("onPlayerWasted", root,
if bodypart and get("show_bodypart") then
local bodypartName = getBodyPartName(bodypart)
if bodypartName then
message = message.." ("..getBodyPartName(bodypart)..")"
message = message.." ("..bodypartName..")"
end
end
outputChatBox(message, root, r, g, b)
Expand Down