bug fixes for paintball module

This commit is contained in:
Lorenc Pekaj 2018-09-11 03:20:01 +10:00
parent 896302c2be
commit d7e803acc9

View File

@ -1,6 +1,6 @@
/* /*
* Irresistible Gaming (c) 2018 * Irresistible Gaming (c) 2018
* Developed by Steven Howard * Developed by Lorenc Pekaj, Steven Howard
* Module: cnr/features/paintball.pwn * Module: cnr/features/paintball.pwn
* Purpose: paintball related features * Purpose: paintball related features
*/ */
@ -60,12 +60,12 @@ new
/* ** Hooks ** */ /* ** Hooks ** */
#if defined AC_INCLUDED #if defined AC_INCLUDED
hook OnPlayerDeathEx(playerid, killerid, reason, Float: damage, bodypart) hook OnPlayerDeathEx( playerid, killerid, reason, Float: damage, bodypart )
#else #else
hook OnPlayerDeath(playerid, killerid, reason) hook OnPlayerDeath( playerid, killerid, reason )
#endif #endif
{ {
if ( p_inPaintBall{ killerid } == true ) if ( IsPlayerConnected( killerid ) && p_inPaintBall{ killerid } == true )
{ {
new new
a = p_PaintBallArena{ killerid }; a = p_PaintBallArena{ killerid };
@ -75,9 +75,8 @@ hook OnPlayerDeath(playerid, killerid, reason)
SetPlayerHealth( killerid, g_paintballData[ a ] [ E_HEALTH ] ); SetPlayerHealth( killerid, g_paintballData[ a ] [ E_HEALTH ] );
SetPlayerArmour( killerid, g_paintballData[ a ] [ E_ARMOUR ] ); SetPlayerArmour( killerid, g_paintballData[ a ] [ E_ARMOUR ] );
} }
return 1; return Y_HOOKS_BREAK_RETURN_1;
} }
return 1; return 1;
} }
@ -631,4 +630,4 @@ CMD:p( playerid, params[ ] )
SendClientMessageToPaintball( id, -1, ""COL_GREY"<Paintball Chat> %s(%d):"COL_WHITE" %s", ReturnPlayerName( playerid ), playerid, msg ); SendClientMessageToPaintball( id, -1, ""COL_GREY"<Paintball Chat> %s(%d):"COL_WHITE" %s", ReturnPlayerName( playerid ), playerid, msg );
} }
return 1; return 1;
} }