diff options
| author | archshift <admin@archshift.com> | 2014-06-09 02:17:30 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-06-17 20:39:20 +0200 |
| commit | 68011a004a83adc793f0df563cc924c5a2b7dddc (patch) | |
| tree | de7b6cb0d1d9e2d41feb3abb853a49d03e1ebfbd /src | |
| parent | ItemHandler: changed IsDrinkable() to take a short argument (diff) | |
| download | cuberite-68011a004a83adc793f0df563cc924c5a2b7dddc.tar cuberite-68011a004a83adc793f0df563cc924c5a2b7dddc.tar.gz cuberite-68011a004a83adc793f0df563cc924c5a2b7dddc.tar.bz2 cuberite-68011a004a83adc793f0df563cc924c5a2b7dddc.tar.lz cuberite-68011a004a83adc793f0df563cc924c5a2b7dddc.tar.xz cuberite-68011a004a83adc793f0df563cc924c5a2b7dddc.tar.zst cuberite-68011a004a83adc793f0df563cc924c5a2b7dddc.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Entities/Pawn.cpp | 3 | ||||
| -rw-r--r-- | src/Items/ItemPotion.h | 12 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp index a1f24138d..297b4afda 100644 --- a/src/Entities/Pawn.cpp +++ b/src/Entities/Pawn.cpp @@ -69,8 +69,7 @@ void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_E } m_EntityEffects[a_EffectType] = a_Effect; - m_World->BroadcastEntityEffect(*this, a_EffectType, a_Effect.GetIntensity(), - a_Effect.m_Ticks * a_Effect.GetDistanceModifier()); + m_World->BroadcastEntityEffect(*this, a_EffectType, a_Effect.GetIntensity(), a_Effect.m_Ticks * a_Effect.GetDistanceModifier()); } diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h index c2441fa48..40748d71c 100644 --- a/src/Items/ItemPotion.h +++ b/src/Items/ItemPotion.h @@ -123,12 +123,7 @@ public: Vector3d Speed = a_Player->GetLookVector() * 7; short potion_damage = a_Item.m_ItemDamage; - cSplashPotionEntity *Projectile = new cSplashPotionEntity(a_Player, Pos.x, Pos.y, Pos.z, &Speed, - GetEntityEffectType(potion_damage), - cEntityEffect(GetEntityEffectDuration(potion_damage), - GetEntityEffectIntensity(potion_damage), - a_Player), - GetPotionName(potion_damage)); + cSplashPotionEntity *Projectile = new cSplashPotionEntity(a_Player, Pos.x, Pos.y, Pos.z, &Speed, GetEntityEffectType(potion_damage), cEntityEffect(GetEntityEffectDuration(potion_damage), GetEntityEffectIntensity(potion_damage), a_Player), GetPotionName(potion_damage)); if (Projectile == NULL) { return false; @@ -152,10 +147,7 @@ public: { // Called when potion is a drinkable potion short potion_damage = a_Item->m_ItemDamage; - a_Player->AddEntityEffect(GetEntityEffectType(potion_damage), - cEntityEffect(GetEntityEffectDuration(potion_damage), - GetEntityEffectIntensity(potion_damage), - a_Player)); + a_Player->AddEntityEffect(GetEntityEffectType(potion_damage), cEntityEffect(GetEntityEffectDuration(potion_damage), GetEntityEffectIntensity(potion_damage), a_Player)); a_Player->GetInventory().RemoveOneEquippedItem(); a_Player->GetInventory().AddItem(E_ITEM_GLASS_BOTTLE); return true; |