diff options
| -rw-r--r-- | sql/FULL/world_spell_full.sql | 8 | ||||
| -rw-r--r-- | src/game/Player.cpp | 6 | ||||
| -rw-r--r-- | src/game/Player.h | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql index 936755f8fe2..f75580d401f 100644 --- a/sql/FULL/world_spell_full.sql +++ b/sql/FULL/world_spell_full.sql @@ -1317,9 +1317,6 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell ( 56612, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Wrecking Crew (Rank 3) ( 56613, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Wrecking Crew (Rank 4) ( 56614, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Wrecking Crew (Rank 5) -( 56636, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Taste for Blood (Rank 1) -( 56637, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Taste for Blood (Rank 2) -( 56638, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Taste for Blood (Rank 3) ( 56816, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0, 0, 0), -- Rune Strike ( 56821, 0x00, 8, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Glyph of Sinister Strike ( 56834, 0x00, 15, 0x00440000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Reaping (Rank 2) @@ -1496,7 +1493,10 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell ( 48545, 0x00, 7, 0x00000010, 0x04000000, 0x00000000, 0x00040000, 0x00000000, 0, 0, 0), -- Revitalize ( 53234, 0x00, 9, 0x00020000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0, 0, 0), -- Piercing Shots (Rank 1) ( 53237, 0x00, 9, 0x00020000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0, 0, 0), -- Piercing Shots (Rank 2) -( 53238, 0x00, 9, 0x00020000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0, 0, 0); -- Piercing Shots (Rank 3) +( 53238, 0x00, 9, 0x00020000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0, 0, 0), -- Piercing Shots (Rank 3) +( 56636, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 6), -- Taste for Blood (Rank 1) +( 56637, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 6), -- Taste for Blood (Rank 2) +( 56638, 0x00, 4, 0x00000020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 6); -- Taste for Blood (Rank 3) -- -------- -- ENCHANT PROC diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 8cd21e1ef48..cc36be390d7 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -21398,3 +21398,9 @@ void Player::ResetMap() Unit::ResetMap(); GetMapRef().unlink(); } + +void SetMap(Map * map) +{ + Unit::SetMap(map); + m_mapRef.link(map, this); +} diff --git a/src/game/Player.h b/src/game/Player.h index d6d512a73a0..fa9e48e4e01 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -2123,7 +2123,7 @@ class TRINITY_DLL_SPEC Player : public Unit MapReference &GetMapRef() { return m_mapRef; } // Set map to player and add reference - void SetMap(Map * map) {Unit::SetMap(map); assert (!m_currMap); m_mapRef.link(map, this);} + void SetMap(Map * map); void ResetMap(); bool isAllowedToLoot(Creature* creature); |