From 02f05f749645d3ef211676e6745d3feda2cd0513 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Wed, 21 Dec 2011 20:42:34 +0000 Subject: =?UTF-8?q?-=20Crafting=20fixed=20in=201.0.0=20-=20Server=20compat?= =?UTF-8?q?ible=20with=20the=20weapons=20and=20equip=20again.=20(Some=20Pa?= =?UTF-8?q?ckets=20were=20incompatible)=20-=20fixed=20bucket=20bugs=20(not?= =?UTF-8?q?=20all)=20-=20Fixed=20clients=20getting=20crashed=20by=20wrong?= =?UTF-8?q?=20Pickups=20-=20fixed=20nearly=20all=20mob=20drops.=20(Check?= =?UTF-8?q?=20wheather=20they=20are=20burning=20is=20missing=20Big=20Grin)?= =?UTF-8?q?=20-=20maybe=20some=20other=20things=20I=20can=C2=B4t=20recall?= =?UTF-8?q?=20atm=20Big=20Grin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://mc-server.googlecode.com/svn/trunk@94 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPlayer.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'source/cPlayer.cpp') diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp index 8238f327c..65b6187a6 100644 --- a/source/cPlayer.cpp +++ b/source/cPlayer.cpp @@ -325,11 +325,7 @@ void cPlayer::Heal( int a_Health ) { if( m_Health < 20 ) { - m_Health += (short)a_Health; - if( m_Health > 20 ) - { - m_Health = 20; - } + m_Health = MIN(a_Health + m_Health, 20); cPacket_UpdateHealth Health; Health.m_Health = m_Health; @@ -344,7 +340,9 @@ void cPlayer::TakeDamage( int a_Damage, cEntity* a_Instigator ) cPacket_UpdateHealth Health; Health.m_Health = m_Health; - m_ClientHandle->Send( Health ); + //TODO: Causes problems sometimes O.o (E.G. Disconnecting when attacked) + if(m_ClientHandle != 0) + m_ClientHandle->Send( Health ); } } -- cgit v1.2.3