diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-01-28 17:54:11 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-01-28 17:54:11 +0100 |
| commit | 71bbf2d44ba5fc00fcb15ed96aff083342309498 (patch) | |
| tree | 94657c14eddc2f81fe55d8c6a15e22165f6d7897 /MCServer | |
| parent | Updated HookNotify with the hook renaming. (diff) | |
| download | cuberite-71bbf2d44ba5fc00fcb15ed96aff083342309498.tar cuberite-71bbf2d44ba5fc00fcb15ed96aff083342309498.tar.gz cuberite-71bbf2d44ba5fc00fcb15ed96aff083342309498.tar.bz2 cuberite-71bbf2d44ba5fc00fcb15ed96aff083342309498.tar.lz cuberite-71bbf2d44ba5fc00fcb15ed96aff083342309498.tar.xz cuberite-71bbf2d44ba5fc00fcb15ed96aff083342309498.tar.zst cuberite-71bbf2d44ba5fc00fcb15ed96aff083342309498.zip | |
Diffstat (limited to 'MCServer')
| -rw-r--r-- | MCServer/Plugins/Core/main.lua | 2 | ||||
| -rw-r--r-- | MCServer/Plugins/Core/onkilling.lua (renamed from MCServer/Plugins/Core/onkilled.lua) | 10 | ||||
| -rw-r--r-- | MCServer/Plugins/HookNotify/HookNotify.lua | 6 |
3 files changed, 9 insertions, 9 deletions
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/onkilling.lua index a8a92f667..19bf0ea9d 100644 --- a/MCServer/Plugins/Core/onkilled.lua +++ b/MCServer/Plugins/Core/onkilling.lua @@ -1,6 +1,6 @@ -function OnKilled( Killed, Killer )
- if( Killer == nil ) then
- local KilledPlayer = tolua.cast( Killed, "cPlayer")
+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
@@ -8,11 +8,11 @@ function OnKilled( Killed, Killer ) local Server = cRoot:Get():GetServer()
Server:SendMessage( cChatColor.Red .. KilledPlayer:GetName() .. " died" )
else
- local KilledPlayer = tolua.cast( Killed, "cPlayer")
+ local KilledPlayer = tolua.cast(Victim, "cPlayer")
if( not KilledPlayer:IsA("cPlayer") or KilledPlayer == nil ) then
return false
end
- local KillerPlayer = tolua.cast( Killer, "cPlayer")
+ local KillerPlayer = tolua.cast(Killer, "cPlayer")
if( not KillerPlayer:IsA("cPlayer") or KillerPlayer == nil ) then
return false
end
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
|