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

For now, removed creator member from Entity Effect for pointer safety

Browse Source
This commit is contained in:
archshift 2014-07-11 17:27:29 -07:00
parent e824cd09b3
commit 4e6395d6ff
12 changed files with 94 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bindings/Plugin.h
View File

@ -57,7 +57,7 @@ public:
virtual bool OnCollectingPickup (cPlayer * a_Player, cPickup * a_Pickup) = 0; virtual bool OnCollectingPickup (cPlayer * a_Player, cPickup * a_Pickup) = 0;
virtual bool OnCraftingNoRecipe (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) = 0; virtual bool OnCraftingNoRecipe (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) = 0;
virtual bool OnDisconnect (cClientHandle & a_Client, const AString & a_Reason) = 0; virtual bool OnDisconnect (cClientHandle & a_Client, const AString & a_Reason) = 0;
virtual bool OnEntityAddEffect (cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, cEntity * a_Originator, double a_DistanceModifier) = 0; virtual bool OnEntityAddEffect (cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, double a_DistanceModifier) = 0;
virtual bool OnExecuteCommand (cPlayer * a_Player, const AStringVector & a_Split) = 0; virtual bool OnExecuteCommand (cPlayer * a_Player, const AStringVector & a_Split) = 0;
virtual bool OnExploded (cWorld & a_World, double a_ExplosionSize, bool a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) = 0; virtual bool OnExploded (cWorld & a_World, double a_ExplosionSize, bool a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) = 0;
virtual bool OnExploding (cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) = 0; virtual bool OnExploding (cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) = 0;

4
src/Bindings/PluginLua.cpp
View File

@ -420,14 +420,14 @@ bool cPluginLua::OnDisconnect(cClientHandle & a_Client, const AString & a_Reason
bool cPluginLua::OnEntityAddEffect(cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, cEntity * a_Originator, double a_DistanceModifier) bool cPluginLua::OnEntityAddEffect(cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, double a_DistanceModifier)
{ {
cCSLock Lock(m_CriticalSection); cCSLock Lock(m_CriticalSection);
bool res = false; bool res = false;
cLuaRefs & Refs = m_HookMap[cPluginManager::HOOK_ENTITY_ADD_EFFECT]; cLuaRefs & Refs = m_HookMap[cPluginManager::HOOK_ENTITY_ADD_EFFECT];
for (cLuaRefs::iterator itr = Refs.begin(), end = Refs.end(); itr != end; ++itr) for (cLuaRefs::iterator itr = Refs.begin(), end = Refs.end(); itr != end; ++itr)
{ {
m_LuaState.Call((int)(**itr), &a_Entity, a_EffectType, a_EffectDurationTicks, a_EffectIntensity, a_Originator, a_DistanceModifier, cLuaState::Return, res); m_LuaState.Call((int)(**itr), &a_Entity, a_EffectType, a_EffectDurationTicks, a_EffectIntensity, a_DistanceModifier, cLuaState::Return, res);
if (res) if (res)
{ {
return true; return true;

2
src/Bindings/PluginLua.h
View File

@ -80,7 +80,7 @@ public:
virtual bool OnCollectingPickup (cPlayer * a_Player, cPickup * a_Pickup) override; virtual bool OnCollectingPickup (cPlayer * a_Player, cPickup * a_Pickup) override;
virtual bool OnCraftingNoRecipe (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) override; virtual bool OnCraftingNoRecipe (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) override;
virtual bool OnDisconnect (cClientHandle & a_Client, const AString & a_Reason) override; virtual bool OnDisconnect (cClientHandle & a_Client, const AString & a_Reason) override;
virtual bool OnEntityAddEffect (cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, cEntity * a_Originator, double a_DistanceModifier) override; virtual bool OnEntityAddEffect (cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, double a_DistanceModifier) override;
virtual bool OnExecuteCommand (cPlayer * a_Player, const AStringVector & a_Split) override; virtual bool OnExecuteCommand (cPlayer * a_Player, const AStringVector & a_Split) override;
virtual bool OnExploded (cWorld & a_World, double a_ExplosionSize, bool a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) override; virtual bool OnExploded (cWorld & a_World, double a_ExplosionSize, bool a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) override;
virtual bool OnExploding (cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) override; virtual bool OnExploding (cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData) override;

4
src/Bindings/PluginManager.cpp
View File

@ -474,7 +474,7 @@ bool cPluginManager::CallHookDisconnect(cClientHandle & a_Client, const AString
bool cPluginManager::CallHookEntityAddEffect(cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, cEntity * a_Originator, double a_DistanceModifier) bool cPluginManager::CallHookEntityAddEffect(cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, double a_DistanceModifier)
{ {
HookMap::iterator Plugins = m_Hooks.find(HOOK_ENTITY_ADD_EFFECT); HookMap::iterator Plugins = m_Hooks.find(HOOK_ENTITY_ADD_EFFECT);
if (Plugins == m_Hooks.end()) if (Plugins == m_Hooks.end())
@ -483,7 +483,7 @@ bool cPluginManager::CallHookEntityAddEffect(cEntity & a_Entity, int a_EffectTyp
} }
for (PluginList::iterator itr = Plugins->second.begin(); itr != Plugins->second.end(); ++itr) for (PluginList::iterator itr = Plugins->second.begin(); itr != Plugins->second.end(); ++itr)
{ {
if ((*itr)->OnEntityAddEffect(a_Entity, a_EffectType, a_EffectDurationTicks, a_EffectIntensity, a_Originator, a_DistanceModifier)) if ((*itr)->OnEntityAddEffect(a_Entity, a_EffectType, a_EffectDurationTicks, a_EffectIntensity, a_DistanceModifier))
{ {
return true; return true;
} }

2
src/Bindings/PluginManager.h
View File

@ -184,7 +184,7 @@ public: // tolua_export
bool CallHookCollectingPickup (cPlayer * a_Player, cPickup & a_Pickup); bool CallHookCollectingPickup (cPlayer * a_Player, cPickup & a_Pickup);
bool CallHookCraftingNoRecipe (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe); bool CallHookCraftingNoRecipe (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe);
bool CallHookDisconnect (cClientHandle & a_Client, const AString & a_Reason); bool CallHookDisconnect (cClientHandle & a_Client, const AString & a_Reason);
bool CallHookEntityAddEffect (cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, cEntity * a_Originator, double a_DistanceModifier); bool CallHookEntityAddEffect (cEntity & a_Entity, int a_EffectType, int a_EffectDurationTicks, int a_EffectIntensity, double a_DistanceModifier);
bool CallHookExecuteCommand (cPlayer * a_Player, const AStringVector & a_Split); // If a_Player == NULL, it is a console cmd bool CallHookExecuteCommand (cPlayer * a_Player, const AStringVector & a_Split); // If a_Player == NULL, it is a console cmd
bool CallHookExploded (cWorld & a_World, double a_ExplosionSize, bool a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData); bool CallHookExploded (cWorld & a_World, double a_ExplosionSize, bool a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData);
bool CallHookExploding (cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData); bool CallHookExploding (cWorld & a_World, double & a_ExplosionSize, bool & a_CanCauseFire, double a_X, double a_Y, double a_Z, eExplosionSource a_Source, void * a_SourceData);

62
src/Entities/EntityEffect.cpp
View File

@ -11,7 +11,6 @@ cEntityEffect::cEntityEffect():
m_Ticks(0), m_Ticks(0),
m_Duration(0), m_Duration(0),
m_Intensity(0), m_Intensity(0),
m_Creator(NULL),
m_DistanceModifier(1) m_DistanceModifier(1)
{ {
@ -21,11 +20,10 @@ cEntityEffect::cEntityEffect():
cEntityEffect::cEntityEffect(int a_Duration, short a_Intensity, cPawn *a_Creator, double a_DistanceModifier): cEntityEffect::cEntityEffect(int a_Duration, short a_Intensity, double a_DistanceModifier):
m_Ticks(0), m_Ticks(0),
m_Duration(a_Duration), m_Duration(a_Duration),
m_Intensity(a_Intensity), m_Intensity(a_Intensity),
m_Creator(a_Creator),
m_DistanceModifier(a_DistanceModifier) m_DistanceModifier(a_DistanceModifier)
{ {
@ -44,35 +42,35 @@ cEntityEffect::~cEntityEffect()
cEntityEffect * cEntityEffect::CreateEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier) cEntityEffect * cEntityEffect::CreateEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, double a_DistanceModifier)
{ {
switch (a_EffectType) switch (a_EffectType)
{ {
case cEntityEffect::effNoEffect: return new cEntityEffect (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effNoEffect: return new cEntityEffect (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effAbsorption: return new cEntityEffectAbsorption (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effAbsorption: return new cEntityEffectAbsorption (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effBlindness: return new cEntityEffectBlindness (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effBlindness: return new cEntityEffectBlindness (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effFireResistance: return new cEntityEffectFireResistance(a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effFireResistance: return new cEntityEffectFireResistance(a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effHaste: return new cEntityEffectHaste (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effHaste: return new cEntityEffectHaste (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effHealthBoost: return new cEntityEffectHealthBoost (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effHealthBoost: return new cEntityEffectHealthBoost (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effHunger: return new cEntityEffectHunger (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effHunger: return new cEntityEffectHunger (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effInstantDamage: return new cEntityEffectInstantDamage (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effInstantDamage: return new cEntityEffectInstantDamage (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effInstantHealth: return new cEntityEffectInstantHealth (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effInstantHealth: return new cEntityEffectInstantHealth (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effInvisibility: return new cEntityEffectInvisibility (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effInvisibility: return new cEntityEffectInvisibility (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effJumpBoost: return new cEntityEffectJumpBoost (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effJumpBoost: return new cEntityEffectJumpBoost (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effMiningFatigue: return new cEntityEffectMiningFatigue (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effMiningFatigue: return new cEntityEffectMiningFatigue (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effNausea: return new cEntityEffectNausea (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effNausea: return new cEntityEffectNausea (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effNightVision: return new cEntityEffectNightVision (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effNightVision: return new cEntityEffectNightVision (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effPoison: return new cEntityEffectPoison (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effPoison: return new cEntityEffectPoison (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effRegeneration: return new cEntityEffectRegeneration (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effRegeneration: return new cEntityEffectRegeneration (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effResistance: return new cEntityEffectResistance (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effResistance: return new cEntityEffectResistance (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effSaturation: return new cEntityEffectSaturation (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effSaturation: return new cEntityEffectSaturation (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effSlowness: return new cEntityEffectSlowness (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effSlowness: return new cEntityEffectSlowness (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effSpeed: return new cEntityEffectSpeed (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effSpeed: return new cEntityEffectSpeed (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effStrength: return new cEntityEffectStrength (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effStrength: return new cEntityEffectStrength (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effWaterBreathing: return new cEntityEffectWaterBreathing(a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effWaterBreathing: return new cEntityEffectWaterBreathing(a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effWeakness: return new cEntityEffectWeakness (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effWeakness: return new cEntityEffectWeakness (a_Duration, a_Intensity, a_DistanceModifier);
case cEntityEffect::effWither: return new cEntityEffectWither (a_Duration, a_Intensity, a_Creator, a_DistanceModifier); case cEntityEffect::effWither: return new cEntityEffectWither (a_Duration, a_Intensity, a_DistanceModifier);
} }
ASSERT(!"Unhandled entity effect type!"); ASSERT(!"Unhandled entity effect type!");
@ -120,7 +118,7 @@ void cEntityEffectInstantHealth::OnActivate(cPawn & a_Target)
{ {
if (((cMonster &) a_Target).IsUndead()) if (((cMonster &) a_Target).IsUndead())
{ {
a_Target.TakeDamage(dtPotionOfHarming, m_Creator, amount, 0); a_Target.TakeDamage(dtPotionOfHarming, NULL, amount, 0); // TODO: Store attacker in a pointer-safe way, pass to TakeDamage
return; return;
} }
} }
@ -147,7 +145,7 @@ void cEntityEffectInstantDamage::OnActivate(cPawn & a_Target)
return; return;
} }
} }
a_Target.TakeDamage(dtPotionOfHarming, m_Creator, amount, 0); a_Target.TakeDamage(dtPotionOfHarming, NULL, amount, 0); // TODO: Store attacker in a pointer-safe way, pass to TakeDamage
} }
@ -248,7 +246,7 @@ void cEntityEffectPoison::OnTick(cPawn & a_Target)
// Cannot take poison damage when health is at 1 // Cannot take poison damage when health is at 1
if (a_Target.GetHealth() > 1) if (a_Target.GetHealth() > 1)
{ {
a_Target.TakeDamage(dtPoisoning, m_Creator, 1, 0); a_Target.TakeDamage(dtPoisoning, NULL, 1, 0);
} }
} }
} }
@ -269,7 +267,7 @@ void cEntityEffectWither::OnTick(cPawn & a_Target)
if (m_Ticks % frequency == 0) if (m_Ticks % frequency == 0)
{ {
a_Target.TakeDamage(dtWither, m_Creator, 1, 0); a_Target.TakeDamage(dtWither, NULL, 1, 0);
} }
//TODO: "<Player> withered away> //TODO: "<Player> withered away>
} }

104
src/Entities/EntityEffect.h
View File

@ -42,9 +42,8 @@ public:
/** Creates an entity effect of the specified type /** Creates an entity effect of the specified type
@param a_Duration How long this effect will last, in ticks @param a_Duration How long this effect will last, in ticks
@param a_Intensity How strong the effect will be applied @param a_Intensity How strong the effect will be applied
@param a_Creator The pawn that produced this entity effect
@param a_DistanceModifier The distance modifier for affecting potency, defaults to 1 */ @param a_DistanceModifier The distance modifier for affecting potency, defaults to 1 */
cEntityEffect(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1); cEntityEffect(int a_Duration, short a_Intensity, double a_DistanceModifier = 1);
virtual ~cEntityEffect(void); virtual ~cEntityEffect(void);
@ -53,9 +52,8 @@ public:
@param a_EffectType The effect type to create the effect from @param a_EffectType The effect type to create the effect from
@param a_Duration How long this effect will last, in ticks @param a_Duration How long this effect will last, in ticks
@param a_Intensity How strong the effect will be applied @param a_Intensity How strong the effect will be applied
@param a_Creator The pawn that produced this entity effect
@param a_DistanceModifier The distance modifier for affecting potency, defaults to 1 */ @param a_DistanceModifier The distance modifier for affecting potency, defaults to 1 */
static cEntityEffect * CreateEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier); static cEntityEffect * CreateEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, double a_DistanceModifier);
/** Returns how many ticks this effect has been active for */ /** Returns how many ticks this effect has been active for */
int GetTicks() { return m_Ticks; } int GetTicks() { return m_Ticks; }
@ -63,15 +61,12 @@ public:
int GetDuration() { return m_Duration; } int GetDuration() { return m_Duration; }
/** Returns how strong the effect will be applied */ /** Returns how strong the effect will be applied */
short GetIntensity() { return m_Intensity; } short GetIntensity() { return m_Intensity; }
/** Returns the pawn that produced this entity effect */
cPawn *GetCreator() { return m_Creator; }
/** Returns the distance modifier for affecting potency */ /** Returns the distance modifier for affecting potency */
double GetDistanceModifier() { return m_DistanceModifier; } double GetDistanceModifier() { return m_DistanceModifier; }
void SetTicks(int a_Ticks) { m_Ticks = a_Ticks; } void SetTicks(int a_Ticks) { m_Ticks = a_Ticks; }
void SetDuration(int a_Duration) { m_Duration = a_Duration; } void SetDuration(int a_Duration) { m_Duration = a_Duration; }
void SetIntensity(short a_Intensity) { m_Intensity = a_Intensity; } void SetIntensity(short a_Intensity) { m_Intensity = a_Intensity; }
void SetCreator(cPawn * a_Creator) { m_Creator = a_Creator; }
void SetDistanceModifier(double a_DistanceModifier) { m_DistanceModifier = a_DistanceModifier; } void SetDistanceModifier(double a_DistanceModifier) { m_DistanceModifier = a_DistanceModifier; }
virtual void OnTick(cPawn & a_Target); virtual void OnTick(cPawn & a_Target);
@ -88,9 +83,6 @@ protected:
/** How strong the effect will be applied */ /** How strong the effect will be applied */
short m_Intensity; short m_Intensity;
/** The pawn that produced this entity effect (threw the potion, etc) */
cPawn *m_Creator;
/** The distance modifier for affecting potency */ /** The distance modifier for affecting potency */
double m_DistanceModifier; double m_DistanceModifier;
}; };
@ -103,8 +95,8 @@ class cEntityEffectSpeed:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectSpeed(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectSpeed(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -117,8 +109,8 @@ class cEntityEffectSlowness:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectSlowness(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectSlowness(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -131,8 +123,8 @@ class cEntityEffectHaste:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectHaste(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectHaste(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -145,8 +137,8 @@ class cEntityEffectMiningFatigue:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectMiningFatigue(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectMiningFatigue(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -159,8 +151,8 @@ class cEntityEffectStrength:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectStrength(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectStrength(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -173,8 +165,8 @@ class cEntityEffectInstantHealth:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectInstantHealth(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectInstantHealth(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
@ -189,8 +181,8 @@ class cEntityEffectInstantDamage:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectInstantDamage(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectInstantDamage(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
@ -205,8 +197,8 @@ class cEntityEffectJumpBoost:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectJumpBoost(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectJumpBoost(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -219,8 +211,8 @@ class cEntityEffectNausea:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectNausea(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectNausea(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -233,8 +225,8 @@ class cEntityEffectRegeneration:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectRegeneration(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectRegeneration(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
@ -249,8 +241,8 @@ class cEntityEffectResistance:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectResistance(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectResistance(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -263,8 +255,8 @@ class cEntityEffectFireResistance:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectFireResistance(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectFireResistance(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -277,8 +269,8 @@ class cEntityEffectWaterBreathing:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectWaterBreathing(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectWaterBreathing(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -291,8 +283,8 @@ class cEntityEffectInvisibility:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectInvisibility(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectInvisibility(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -305,8 +297,8 @@ class cEntityEffectBlindness:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectBlindness(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectBlindness(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -319,8 +311,8 @@ class cEntityEffectNightVision:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectNightVision(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectNightVision(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -333,8 +325,8 @@ class cEntityEffectHunger:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectHunger(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectHunger(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
@ -349,8 +341,8 @@ class cEntityEffectWeakness:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectWeakness(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectWeakness(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
@ -365,8 +357,8 @@ class cEntityEffectPoison:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectPoison(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectPoison(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
@ -381,8 +373,8 @@ class cEntityEffectWither:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectWither(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectWither(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
@ -397,8 +389,8 @@ class cEntityEffectHealthBoost:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectHealthBoost(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectHealthBoost(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -411,8 +403,8 @@ class cEntityEffectAbsorption:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectAbsorption(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectAbsorption(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }
}; };
@ -425,8 +417,8 @@ class cEntityEffectSaturation:
{ {
typedef cEntityEffect super; typedef cEntityEffect super;
public: public:
cEntityEffectSaturation(int a_Duration, short a_Intensity, cPawn * a_Creator, double a_DistanceModifier = 1): cEntityEffectSaturation(int a_Duration, short a_Intensity, double a_DistanceModifier = 1):
super(a_Duration, a_Intensity, a_Creator, a_DistanceModifier) super(a_Duration, a_Intensity, a_DistanceModifier)
{ {
} }

7
src/Entities/Pawn.cpp
View File

@ -52,16 +52,17 @@ void cPawn::Tick(float a_Dt, cChunk & a_Chunk)
void cPawn::KilledBy(cEntity * a_Killer) void cPawn::KilledBy(cEntity * a_Killer)
{ {
ClearEntityEffects(); ClearEntityEffects();
super::KilledBy(a_Killer);
} }
void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, cPawn * a_Creator, 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:
if (cPluginManager::Get()->CallHookEntityAddEffect(*this, a_EffectType, a_Duration, a_Intensity, a_Creator, a_DistanceModifier)) if (cPluginManager::Get()->CallHookEntityAddEffect(*this, a_EffectType, a_Duration, a_Intensity, a_DistanceModifier))
{ {
// A plugin disallows the addition, bail out. // A plugin disallows the addition, bail out.
return; return;
@ -74,7 +75,7 @@ void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, s
} }
a_Duration = (int)(a_Duration * a_DistanceModifier); a_Duration = (int)(a_Duration * a_DistanceModifier);
m_EntityEffects[a_EffectType] = cEntityEffect::CreateEntityEffect(a_EffectType, a_Duration, a_Intensity, a_Creator, a_DistanceModifier); m_EntityEffects[a_EffectType] = cEntityEffect::CreateEntityEffect(a_EffectType, a_Duration, a_Intensity, a_DistanceModifier);
m_World->BroadcastEntityEffect(*this, a_EffectType, a_Intensity, a_Duration); m_World->BroadcastEntityEffect(*this, a_EffectType, a_Intensity, a_Duration);
m_EntityEffects[a_EffectType]->OnActivate(*this); m_EntityEffects[a_EffectType]->OnActivate(*this);
} }

3
src/Entities/Pawn.h
View File

@ -30,10 +30,9 @@ public:
@param a_EffectType The entity effect to apply @param a_EffectType The entity effect to apply
@param a_EffectDurationTicks The duration of the effect @param a_EffectDurationTicks The duration of the effect
@param a_EffectIntensity The level of the effect (0 = Potion I, 1 = Potion II, etc) @param a_EffectIntensity The level of the effect (0 = Potion I, 1 = Potion II, etc)
@param a_Creator The pawn that produced the effect (e.g. threw the potion)
@param a_DistanceModifier The scalar multiplied to the potion duration, only applies to splash potions) @param a_DistanceModifier The scalar multiplied to the potion duration, only applies to splash potions)
*/ */
void AddEntityEffect(cEntityEffect::eType a_EffectType, int a_EffectDurationTicks, short a_EffectIntensity, cPawn * a_Creator, double a_DistanceModifier = 1); void AddEntityEffect(cEntityEffect::eType a_EffectType, int a_EffectDurationTicks, short a_EffectIntensity, double a_DistanceModifier = 1);
/** Removes a currently applied entity effect /** Removes a currently applied entity effect
@param a_EffectType The entity effect to remove @param a_EffectType The entity effect to remove

2
src/Entities/SplashPotionEntity.cpp
View File

@ -79,7 +79,7 @@ bool cSplashPotionEntity::cSplashPotionCallback::Item(cEntity * a_Entity)
} }
m_EntityEffect.SetDistanceModifier(Reduction); m_EntityEffect.SetDistanceModifier(Reduction);
((cPawn *) a_Entity)->AddEntityEffect(m_EntityEffectType, m_EntityEffect.GetDuration(), m_EntityEffect.GetIntensity(), m_EntityEffect.GetCreator(), Reduction); ((cPawn *) a_Entity)->AddEntityEffect(m_EntityEffectType, m_EntityEffect.GetDuration(), m_EntityEffect.GetIntensity(), Reduction);
} }
return false; return false;
} }

4
src/Items/ItemPotion.h
View File

@ -123,7 +123,7 @@ public:
Vector3d Speed = a_Player->GetLookVector() * 7; Vector3d Speed = a_Player->GetLookVector() * 7;
short potion_damage = a_Item.m_ItemDamage; 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)), GetPotionName(potion_damage));
if (Projectile == NULL) if (Projectile == NULL)
{ {
return false; return false;
@ -146,7 +146,7 @@ public:
virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override
{ {
// Called when potion is a drinkable potion // Called when potion is a drinkable potion
a_Player->AddEntityEffect(GetEntityEffectType(a_Item->m_ItemDamage), GetEntityEffectDuration(a_Item->m_ItemDamage), GetEntityEffectIntensity(a_Item->m_ItemDamage), a_Player); a_Player->AddEntityEffect(GetEntityEffectType(a_Item->m_ItemDamage), GetEntityEffectDuration(a_Item->m_ItemDamage), GetEntityEffectIntensity(a_Item->m_ItemDamage));
a_Player->GetInventory().RemoveOneEquippedItem(); a_Player->GetInventory().RemoveOneEquippedItem();
a_Player->GetInventory().AddItem(E_ITEM_GLASS_BOTTLE); a_Player->GetInventory().AddItem(E_ITEM_GLASS_BOTTLE);
return true; return true;

2
src/Mobs/CaveSpider.cpp
View File

@ -34,7 +34,7 @@ void cCaveSpider::Attack(float a_Dt)
if (m_Target->IsPawn()) if (m_Target->IsPawn())
{ {
// TODO: Easy = no poison, Medium = 7 seconds, Hard = 15 seconds // TODO: Easy = no poison, Medium = 7 seconds, Hard = 15 seconds
((cPawn *) m_Target)->AddEntityEffect(cEntityEffect::effPoison, 7 * 20, 0, this); ((cPawn *) m_Target)->AddEntityEffect(cEntityEffect::effPoison, 7 * 20, 0);
} }
} }