Kitzunu
2021-01-10 14:27:55 +01:00
committed by GitHub
parent 7cf097eab2
commit da4edd547d
315 changed files with 3 additions and 729 deletions

View File

@@ -436,7 +436,6 @@ typedef std::map<uint32, time_t> CreatureSpellCooldowns;
class Creature : public Unit, public GridObject<Creature>, public MovableMapObject
{
public:
explicit Creature(bool isWorldObject = false);
~Creature() override;

View File

@@ -16,7 +16,6 @@
class Bag : public Item
{
public:
Bag();
~Bag() override;
@@ -49,7 +48,6 @@ public:
void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const override;
protected:
// Bag Storage space
Item* m_bagslot[MAX_BAG_SIZE];
};

View File

@@ -328,7 +328,6 @@ public:
DataMap CustomData;
protected:
Object();
void _InitValues();
@@ -635,7 +634,6 @@ struct MovementInfo
}
float zspeed, sinAngle, cosAngle, xyspeed;
} jump;
// spline

View File

@@ -81,7 +81,6 @@ void Pet::AddToWorld()
GetCharmInfo()->SetIsFollowing(false);
GetCharmInfo()->SetIsReturning(false);
}
}
void Pet::RemoveFromWorld()
@@ -839,7 +838,6 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
}
case SUMMON_PET:
{
if (pInfo)
{
SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(pInfo->min_dmg));
@@ -1192,7 +1190,6 @@ void Pet::_SaveSpellCooldowns(SQLTransaction& trans, bool logout)
stmt->setUInt32(1, itr2->first);
stmt->setUInt32(2, cooldown);
trans->Append(stmt);
}
}
}
@@ -2329,7 +2326,6 @@ void Pet::RemoveSpellCooldown(uint32 spell_id, bool update /* = false */)
if (update)
{
if (Player* playerOwner = GetCharmerOrOwnerPlayerOrPlayerItself())
{
WorldPacket data(SMSG_CLEAR_COOLDOWN, 4 + 8);

View File

@@ -185,7 +185,6 @@ enum PetScalingSpells
SPELL_DK_PET_SCALING_01 = 51996,
SPELL_DK_PET_SCALING_02 = 54566,
SPELL_DK_PET_SCALING_03 = 61697
};
#define PET_FOLLOW_DIST 1.0f

View File

@@ -2644,7 +2644,6 @@ void Player::RegenerateAll()
// xinef: if grace is started, increase it but no more than cap
else if (uint32 grace = GetGracePeriod(i))
{
if (grace < RUNE_GRACE_PERIOD)
SetGracePeriod(i, std::min<uint32>(grace + m_regenTimer, RUNE_GRACE_PERIOD));
}
@@ -4110,7 +4109,6 @@ bool Player::IsNeedCastPassiveSpellAtLearn(SpellInfo const* spellInfo) const
ShapeshiftForm form = GetShapeshiftForm();
return (!spellInfo->Stances || (form && (spellInfo->Stances & (1 << (form - 1)))) ||
(!form && spellInfo->HasAttribute(SPELL_ATTR2_NOT_NEED_SHAPESHIFT)));
}
void Player::learnSpell(uint32 spellId)
@@ -8653,7 +8651,6 @@ void Player::CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32
if (spellData.SpellPPMRate)
{
uint32 WeaponSpeed = GetAttackTime(attType);
chance = GetPPMProcChance(WeaponSpeed, spellData.SpellPPMRate, spellInfo);
}
@@ -18837,7 +18834,6 @@ void Player::_LoadInventory(PreparedQueryResult result, uint32 timeDiff)
delete item;
continue;
}
}
// Item's state may have changed after storing

View File

@@ -1042,11 +1042,9 @@ public: // constructors
void SetInAcceptProcess(bool state) { m_acceptProccess = state; }
private: // internal functions
void Update(bool for_trader = true);
private: // fields
Player* m_player; // Player who own of this TradeData
Player* m_trader; // Player who trade with m_player

View File

@@ -2375,7 +2375,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackTy
MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit* victim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const
{
if (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsEvadingAttacks())
return MELEE_HIT_EVADE;
@@ -9929,7 +9928,6 @@ void Unit::ModifyAuraState(AuraStateType flag, bool apply)
if( AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID()) )
(*itr).second->HandleAllEffects(aurApp, AURA_EFFECT_HANDLE_REAL, true);
}
}
}
else
@@ -11297,7 +11295,6 @@ int32 Unit::SpellBaseDamageBonusDone(SpellSchoolMask schoolMask)
for (AuraEffectList::const_iterator i = mDamageDonebyAP.begin(); i != mDamageDonebyAP.end(); ++i)
if ((*i)->GetMiscValue() & schoolMask)
DoneAdvertisedBenefit += int32(CalculatePct(GetTotalAttackPowerValue(BASE_ATTACK), (*i)->GetAmount()));
}
return DoneAdvertisedBenefit;
}
@@ -12766,7 +12763,6 @@ void Unit::Dismount()
void Unit::SetInCombatWith(Unit* enemy, uint32 duration)
{
// Xinef: Dont allow to start combat with triggers
if (enemy->GetTypeId() == TYPEID_UNIT && enemy->ToCreature()->IsTrigger())
return;
@@ -12793,7 +12789,6 @@ void Unit::SetInCombatWith(Unit* enemy, uint32 duration)
void Unit::CombatStart(Unit* target, bool initialAggro)
{
// Xinef: Dont allow to start combat with triggers
if (target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->IsTrigger())
return;
@@ -13078,7 +13073,6 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo
if (FactionState const* repState = player->GetReputationMgr().GetState(factionEntry))
if (!(repState->Flags & FACTION_FLAG_AT_WAR))
return false;
}
}
}
@@ -14081,7 +14075,6 @@ int32 Unit::ModSpellDuration(SpellInfo const* spellProto, Unit const* target, in
{
// else positive mods here, there are no currently
// when there will be, change GetTotalAuraModifierByMiscValue to GetTotalPositiveAuraModifierByMiscValue
}
// Glyphs which increase duration of selfcasted buffs
@@ -15762,7 +15755,6 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
takeCharges = true;
else if (triggeredByAura->GetAmount()) // aura must have amount
{
int32 damageLeft = triggeredByAura->GetAmount();
// No damage left
if (damageLeft < int32(damage))
@@ -16339,7 +16331,6 @@ float Unit::CalculateDefaultCoefficient(SpellInfo const* spellInfo, DamageEffect
float DotFactor = 1.0f;
if (damagetype == DOT)
{
int32 DotDuration = spellInfo->GetDuration();
if (!spellInfo->IsChanneled() && DotDuration > 0)
DotFactor = DotDuration / 15000.0f;
@@ -16740,7 +16731,6 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue(AuraEffect* triggeredByAura)
// heal
CastCustomSpell(this, 33110, &heal, nullptr, nullptr, true, nullptr, nullptr, caster_guid);
return true;
}
bool Unit::HandleAuraRaidProcFromCharge(AuraEffect* triggeredByAura)
{

View File

@@ -1231,7 +1231,6 @@ public:
[[nodiscard]] ReactStates GetPlayerReactState() const { return _oldReactState; }
private:
Unit* _unit;
UnitActionBarEntry PetActionBar[MAX_UNIT_ACTION_BAR_INDEX];
CharmSpellInfo _charmspells[4];