From 71bbf2d44ba5fc00fcb15ed96aff083342309498 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 28 Jan 2013 16:54:11 +0000 Subject: Renamed HOOK_KILLED to HOOK_KILLING to match naming conventions. Also tweaked the mechanics so that plugins may revive without dropping other plugins out of the picture. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1182 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- MCServer/Plugins/Core/main.lua | 2 +- MCServer/Plugins/Core/onkilled.lua | 24 ------------------------ MCServer/Plugins/Core/onkilling.lua | 24 ++++++++++++++++++++++++ MCServer/Plugins/HookNotify/HookNotify.lua | 6 +++--- 4 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 MCServer/Plugins/Core/onkilled.lua create mode 100644 MCServer/Plugins/Core/onkilling.lua (limited to 'MCServer') diff --git a/MCServer/Plugins/Core/main.lua b/MCServer/Plugins/Core/main.lua index 97263f1d6..2dfbfb407 100644 --- a/MCServer/Plugins/Core/main.lua +++ b/MCServer/Plugins/Core/main.lua @@ -19,7 +19,7 @@ function Initialize( Plugin ) PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_BREAKING_BLOCK) PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_PLACING_BLOCK) PluginManager:AddHook(Plugin, cPluginManager.HOOK_LOGIN) - PluginManager:AddHook(Plugin, cPluginManager.HOOK_KILLED) + PluginManager:AddHook(Plugin, cPluginManager.HOOK_KILLING) PluginManager:AddHook(Plugin, cPluginManager.HOOK_CRAFTING_NO_RECIPE) PluginManager:AddHook(Plugin, cPluginManager.HOOK_CHAT) -- used in web_chat.lua diff --git a/MCServer/Plugins/Core/onkilled.lua b/MCServer/Plugins/Core/onkilled.lua deleted file mode 100644 index a8a92f667..000000000 --- a/MCServer/Plugins/Core/onkilled.lua +++ /dev/null @@ -1,24 +0,0 @@ -function OnKilled( Killed, Killer ) - if( Killer == nil ) then - local KilledPlayer = tolua.cast( Killed, "cPlayer") - if( not KilledPlayer:IsA("cPlayer") or KilledPlayer == nil ) then - return false - end - - local Server = cRoot:Get():GetServer() - Server:SendMessage( cChatColor.Red .. KilledPlayer:GetName() .. " died" ) - else - local KilledPlayer = tolua.cast( Killed, "cPlayer") - if( not KilledPlayer:IsA("cPlayer") or KilledPlayer == nil ) then - return false - end - local KillerPlayer = tolua.cast( Killer, "cPlayer") - if( not KillerPlayer:IsA("cPlayer") or KillerPlayer == nil ) then - return false - end - - local Server = cRoot:Get():GetServer() - Server:SendMessage( cChatColor.Red .. KilledPlayer:GetName() .. " was killed by " .. KillerPlayer:GetName() .. "!" ) - end - return false -end \ No newline at end of file diff --git a/MCServer/Plugins/Core/onkilling.lua b/MCServer/Plugins/Core/onkilling.lua new file mode 100644 index 000000000..19bf0ea9d --- /dev/null +++ b/MCServer/Plugins/Core/onkilling.lua @@ -0,0 +1,24 @@ +function OnKilling(Victim, Killer) + if (Killer == nil) then + local KilledPlayer = tolua.cast(Victim, "cPlayer") + if( not KilledPlayer:IsA("cPlayer") or KilledPlayer == nil ) then + return false + end + + local Server = cRoot:Get():GetServer() + Server:SendMessage( cChatColor.Red .. KilledPlayer:GetName() .. " died" ) + else + local KilledPlayer = tolua.cast(Victim, "cPlayer") + if( not KilledPlayer:IsA("cPlayer") or KilledPlayer == nil ) then + return false + end + local KillerPlayer = tolua.cast(Killer, "cPlayer") + if( not KillerPlayer:IsA("cPlayer") or KillerPlayer == nil ) then + return false + end + + local Server = cRoot:Get():GetServer() + Server:SendMessage( cChatColor.Red .. KilledPlayer:GetName() .. " was killed by " .. KillerPlayer:GetName() .. "!" ) + end + return false +end \ No newline at end of file diff --git a/MCServer/Plugins/HookNotify/HookNotify.lua b/MCServer/Plugins/HookNotify/HookNotify.lua index 2d74a38d8..f04dc023c 100644 --- a/MCServer/Plugins/HookNotify/HookNotify.lua +++ b/MCServer/Plugins/HookNotify/HookNotify.lua @@ -21,7 +21,7 @@ function Initialize(Plugin) PluginManager:AddHook(Plugin, cPluginManager.HOOK_CRAFTING_NO_RECIPE); PluginManager:AddHook(Plugin, cPluginManager.HOOK_DISCONNECT); PluginManager:AddHook(Plugin, cPluginManager.HOOK_HANDSHAKE); - PluginManager:AddHook(Plugin, cPluginManager.HOOK_KILLED); + PluginManager:AddHook(Plugin, cPluginManager.HOOK_KILLING); PluginManager:AddHook(Plugin, cPluginManager.HOOK_LOGIN); PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_BREAKING_BLOCK); PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_BROKEN_BLOCK); @@ -154,8 +154,8 @@ end -function OnKilled(...) - LogHook("OnKilled", unpack(arg)); +function OnKilling(...) + LogHook("OnKilling", unpack(arg)); end -- cgit v1.2.3