From 2691e8daed826e944ca38f4787c77273edbf9404 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 18 Aug 2012 09:56:28 +0000 Subject: Packet refactoring, phase two, partial. Rewritten a few packet handling functions not to use cPacket-descendant objects. This breaks plugin API! Plugins need to modify their hook functions to match those used in the Core plugin git-svn-id: http://mc-server.googlecode.com/svn/trunk@750 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cFurnaceEntity.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/cFurnaceEntity.cpp') diff --git a/source/cFurnaceEntity.cpp b/source/cFurnaceEntity.cpp index 6fe1936e9..2373b3555 100644 --- a/source/cFurnaceEntity.cpp +++ b/source/cFurnaceEntity.cpp @@ -120,7 +120,7 @@ bool cFurnaceEntity::Tick( float a_Dt ) if ((m_CookingItem != NULL) && ((m_TimeBurned < m_BurnTime) || (m_TimeCooked + a_Dt >= m_CookTime))) { - if (m_CookingItem->Equals(m_Items[2]) || m_Items[2].IsEmpty()) + if (m_CookingItem->IsEqual(m_Items[2]) || m_Items[2].IsEmpty()) { m_TimeCooked += a_Dt; if ( m_TimeCooked >= m_CookTime ) @@ -201,9 +201,9 @@ bool cFurnaceEntity::StartCooking(void) if( (m_TimeBurned < m_BurnTime) || BurnTime > 0.f ) // burnable material { const cFurnaceRecipe::Recipe* R = FR->GetRecipeFrom( m_Items[0] ); - if( R ) // cook able ingredient + if (R != NULL) // cook able ingredient { - if( m_Items[2].Equals( *R->Out ) || m_Items[2].IsEmpty() ) + if (m_Items[2].IsEqual(*R->Out) || m_Items[2].IsEmpty()) { // good to go @@ -241,7 +241,7 @@ bool cFurnaceEntity::ContinueCooking(void) const cFurnaceRecipe::Recipe * R = FR->GetRecipeFrom( m_Items[0] ); if (R != NULL) // cook able ingredient { - if (m_Items[2].Equals(*R->Out) || m_Items[2].IsEmpty()) + if (m_Items[2].IsEqual(*R->Out) || m_Items[2].IsEmpty()) { // good to go if (m_CookingItem == NULL) // Only cook new item if not already cooking -- cgit v1.2.3