diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-01 23:48:40 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-01 23:48:40 +0200 |
| commit | 97fc632b9d32727480d42e7c056dff72ead8fb4e (patch) | |
| tree | 0898abdb12107ced7fcb53febb4556d8e465b3aa /src/server/scripts/Outland | |
| parent | d6fdd05493aaa8600b07eb17dfee222a8379b033 (diff) | |
| parent | 37bdc7a62b5d719f9c78d8db99837c769ce900e0 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Server/WorldSession.cpp
Diffstat (limited to 'src/server/scripts/Outland')
| -rw-r--r-- | src/server/scripts/Outland/zone_netherstorm.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 74257c95cf3..7c328f57e78 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -753,7 +753,6 @@ public: bool Drained; uint8 WeakPercent; - Player* player; uint64 PlayerGUID; uint32 ManaBurnTimer; |