From 37276a4430e26f5b3ab56e07d5f30a194f75982e Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 1 Jul 2013 10:39:56 +0000 Subject: Rewritten entity-on-fire management ("forever on fire" bugs) Fixes FS #297 and part of FS #403. Added sizes to all entities. Moved all damage-related functions from cPawn to cEntity API change: renamed cPawn:TeleportTo() to cEntity:TeleportToCoords() git-svn-id: http://mc-server.googlecode.com/svn/trunk@1635 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Plugin.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/Plugin.cpp') diff --git a/source/Plugin.cpp b/source/Plugin.cpp index daf1d33c8..23757f492 100644 --- a/source/Plugin.cpp +++ b/source/Plugin.cpp @@ -2,7 +2,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Plugin.h" -#include "Pawn.h" +// #include "Pawn.h" #include "Player.h" #include "World.h" #include "CommandOutput.h" @@ -187,7 +187,7 @@ bool cPlugin::OnHandshake(cClientHandle * a_Client, const AString & a_Username) -bool cPlugin::OnKilling(cPawn & a_Victim, cEntity * a_Killer) +bool cPlugin::OnKilling(cEntity & a_Victim, cEntity * a_Killer) { UNUSED(a_Victim); UNUSED(a_Killer); @@ -468,9 +468,9 @@ bool cPlugin::OnPreCrafting(const cPlayer * a_Player, const cCraftingGrid * a_Gr -bool cPlugin::OnTakeDamage(cPawn & a_Pawn, TakeDamageInfo & a_TakeDamageInfo) +bool cPlugin::OnTakeDamage(cEntity & a_Receiver, TakeDamageInfo & a_TakeDamageInfo) { - UNUSED(a_Pawn); + UNUSED(a_Receiver); UNUSED(a_TakeDamageInfo); return false; } -- cgit v1.2.3