diff options
Diffstat (limited to 'MCServer/Plugins/Core/ondeath.lua')
| -rw-r--r-- | MCServer/Plugins/Core/ondeath.lua | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/MCServer/Plugins/Core/ondeath.lua b/MCServer/Plugins/Core/ondeath.lua index 47a7532a6..463890751 100644 --- a/MCServer/Plugins/Core/ondeath.lua +++ b/MCServer/Plugins/Core/ondeath.lua @@ -3,54 +3,54 @@ function OnKilling(Victim, Killer) SetBackCoordinates( Victim ) Server = cRoot:Get():GetServer() if Killer == nil then - if Victim:IsOnFire() then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was burnt to a cinder" ) + if Victim:GetWorld():GetBlock(Victim:GetPosX(), Victim:GetPosY(), Victim:GetPosZ()) == 10 or Victim:GetWorld():GetBlock(Victim:GetPosX(), Victim:GetPosY(), Victim:GetPosZ()) == 11 then + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " tried to swim in lava (and failed)" ) CheckHardcore(Victim) return false end - if Victim:GetWorld():GetBlock(Victim:GetPosX(), Victim:GetPosY(), Victim:GetPosZ()) == 10 or Victim:GetWorld():GetBlock(Victim:GetPosX(), Victim:GetPosY(), Victim:GetPosZ()) == 11 then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " tried to swim in lava (and failed)" ) + if Victim:IsOnFire() then + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was burnt to a cinder" ) CheckHardcore(Victim) return false end else if Killer:IsPlayer() then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was terminated by " .. Killer:GetName() ) + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was terminated by " .. Killer:GetName() ) CheckHardcore(Victim) return false elseif Killer:IsMob() then if Killer:IsA("cZombie") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was eaten by a Zombie") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was eaten by a zombie") elseif Killer:IsA("cSkeleton") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was shot by a Skeleton" ) + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was shot by a skeleton" ) elseif Killer:IsA("cCreeper") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was blown up by a Creeper") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was blown up by a creeper") elseif Killer:IsA("cSpider") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was ripped apart by a giant Spider") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was ripped apart by a giant spider") elseif Killer:IsA("cCaveSpider") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was poisoned by a giant Cave Spider") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was poisoned by a giant cave spider") elseif Killer:IsA("cBlaze") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was flamed by a Blaze") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was flamed by a blaze") elseif Killer:IsA("cEnderman") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was " .. cChatColor.Random .. " by an Enderman") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was " .. cChatColor.Random .. " by an enderman") elseif Killer:IsA("cSilverfish") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was... DERPED by a Silverfish!") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " encountered an unexpectedly fatal silverfish attack") elseif Killer:IsA("cSlime") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was stuck fast and killed by a Slime") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was absorbed and digested by a slime") elseif Killer:IsA("cWitch") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was enchanted (to death) by a Witch") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was enchanted (to death) by a witch") elseif Killer:IsA("cZombiepigman") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was slain by a Zombie Pigman") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was slain by a zombie pigman") elseif Killer:IsA("cMagmacube") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was incinerated by a Magmacube") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was incinerated by a magmacube") elseif Killer:IsA("cWolf") then - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " was savaged by a Wolf") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " was savaged by a wolf") end CheckHardcore(Victim) return false end end - Server:SendMessage( cChatColor.Red .. Victim:GetName() .. " died of mysterious circumstances") + Server:SendMessage( cChatColor.Red .. "[FATALITY] " .. cChatColor.White .. Victim:GetName() .. " died of mysterious circumstances") CheckHardcore(Victim) end end |