aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/mangos.sql5
-rw-r--r--src/game/Player.cpp2
-rw-r--r--src/shared/revision_nr.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql
index be030724d34..9f9a5dfb91e 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -17267,7 +17267,10 @@ INSERT INTO `spell_bonus_data` VALUES
('116', '0.8143', '0', '0', 'Mage - Frost Bolt'),
('11426', '0.8053', '0', '0', 'Mage - Ice Barrier'),
('30455', '0.1429', '0', '0', 'Mage - Ice Lance'),
-('19750', '0.4286', '0', '0', 'Paladin - Flash of Light'),
+('34913','0', '0', '0', 'Mage - Molten Armor Triggered Rank 1'),
+('43043','0', '0', '0', 'Mage - Molten Armor Triggered Rank 2'),
+('43044','0', '0', '0', 'Mage - Molten Armor Triggered Rank 3'),
+('19750','0.4286', '0', '0', 'Paladin - Flash of Light'),
('635', '0.7143', '0', '0', 'Paladin - Holy Light'),
('25912', '0.4286', '0', '0', 'Paladin - Holy Shock Triggered Hurt Rank 1'),
('25911', '0.4286', '0', '0', 'Paladin - Holy Shock Triggered Hurt Rank 2'),
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 4b0ab3b4b03..e0c57856b8f 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -932,7 +932,7 @@ void Player::HandleDrowning()
return;
}
- uint32 UnderWaterTime = 3*MINUTE*1000; // default length 1 min
+ uint32 UnderWaterTime = 3*MINUTE*1000; // default duration
AuraList const& mModWaterBreathing = GetAurasByType(SPELL_AURA_MOD_WATER_BREATHING);
for(AuraList::const_iterator i = mModWaterBreathing.begin(); i != mModWaterBreathing.end(); ++i)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index d24f5ee135e..396bf02826b 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "7245"
+ #define REVISION_NR "7246"
#endif // __REVISION_NR_H__