Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/Spells/spell_paladin.cpp
This commit is contained in:
commit
df6f300542
24 files changed
+197
-75
No files matched your search
@@ -79,7 +79,7 @@ enum MiscSpells
|
||||
class PowerCheck
|
||||
{
|
||||
public:
|
||||
explicit PowerCheck(Powers power) : _power(power) { }
|
||||
explicit PowerCheck(Powers const power) : _power(power) { }
|
||||
|
||||
bool operator()(WorldObject* obj) const
|
||||
{
|
||||
@@ -90,7 +90,7 @@ class PowerCheck
|
||||
}
|
||||
|
||||
private:
|
||||
Powers _power;
|
||||
Powers const _power;
|
||||
};
|
||||
|
||||
class RaidCheck
|
||||
|
||||
Reference in new issue
Block a user