From 912a1e7adc650d20b0302a3dfe45816b5e541bc7 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 21 Dec 2012 11:04:08 +0000 Subject: Refactored the TakeDamage API to take equipped weapon and armor into consideration (PvP untested) http://forum.mc-server.org/showthread.php?tid=625 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1087 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/PluginManager.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'source/PluginManager.h') diff --git a/source/PluginManager.h b/source/PluginManager.h index ebbd0ca89..8dacc3ccb 100644 --- a/source/PluginManager.h +++ b/source/PluginManager.h @@ -12,22 +12,26 @@ class cLuaCommandBinder; class cPlugin; -// fwd: cWorld.h +// fwd: World.h class cWorld; -// fwd: cLuaChunk.h +// fwd: LuaChunk.h class cLuaChunk; -// fwd: cPlayer.h +// fwd: Player.h class cPlayer; // fwd: CraftingRecipes.h class cCraftingGrid; class cCraftingRecipe; -// fwd: cPickup.h +// fwd: Pickup.h class cPickup; +// fwd: Pawn.h +struct TakeDamageInfo; +class cPawn; + @@ -54,7 +58,7 @@ public: //tolua_export HOOK_PLAYER_SPAWN, HOOK_PLAYER_JOIN, HOOK_PLAYER_MOVE, - HOOK_TAKE_DAMAGE, + HOOK_TAKE_DAMAGE, // cPawn, TakeDamageInfo HOOK_KILLED, HOOK_CHUNK_GENERATED, HOOK_CHUNK_GENERATING, @@ -115,6 +119,7 @@ public: //tolua_export bool CallHookLogin (cClientHandle * a_Client, int a_ProtocolVersion, const AString & a_Username); bool CallHookPostCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe); bool CallHookPreCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe); + bool CallHookTakeDamage (cPawn & a_Receiver, TakeDamageInfo & a_TDI); bool CallHookUpdatedSign (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4, cPlayer * a_Player); bool CallHookUpdatingSign (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4, cPlayer * a_Player); bool CallHookWeatherChanged (cWorld * a_World); -- cgit v1.2.3