flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2586 from bibo38/drownpotion

Browse Source 
Implemented the Water Breathing Potion functionality.
This commit is contained in:
worktycho 2015-11-01 14:20:13 +00:00
commit 2c5c4fa03d
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Entities/Pawn.cpp
View File

@ -70,6 +70,21 @@ bool cPawn::IsFireproof(void) const
void cPawn::HandleAir(void)
{
if (IsSubmerged() && HasEntityEffect(cEntityEffect::effWaterBreathing))
{
// Prevent the oxygen from decreasing
return;
}
super::HandleAir();
}
void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, double a_DistanceModifier) void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, double a_DistanceModifier)
{ {
// Check if the plugins allow the addition: // Check if the plugins allow the addition:

1
src/Entities/Pawn.h
View File

@ -24,6 +24,7 @@ public:
virtual void KilledBy(TakeDamageInfo & a_TDI) override; virtual void KilledBy(TakeDamageInfo & a_TDI) override;
virtual bool IsFireproof(void) const override; virtual bool IsFireproof(void) const override;
virtual void HandleAir(void) override;
// tolua_begin // tolua_begin