Commit Graph
100 Commits
Author SHA1 Message Date
Shauren 6b7c6f4366 Core/Players: Implemented serverside validation of reserved/profane names
Closes #15357

New library dependency: Boost.Regex

(cherry picked from commit b564c10b13effed63c7b7dae25117e2e0a2c64e4)
(cherry picked from commit 1de03cf107)

Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
2016-01-11 23:27:43 -03:00
Shauren 8624325f23 Core/Conditions: Optimizations part 3 changed ConditionStore to a simple array
(cherry picked from commit db0c48c17fdf61b8816cc229dcfec907354326cd)
2016-01-11 01:52:20 -03:00
Shauren a83b61b807 Core/Conditions: Optimizations part 3 removed copying condition containers all over the place
(cherry picked from commit b09e63e9debfab49e635a591339294dd96b09d95)

Conflicts:
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
2016-01-11 01:52:17 -03:00
Shauren 70217b0d84 Core/Conditions: Add const to methods not modifying ConditionMgr
(cherry picked from commit 2cce998e905bed0873fbf0b3da981857c139e5d5)

Conflicts:
	src/server/game/Conditions/ConditionMgr.cpp
2016-01-11 01:52:13 -03:00
Shauren 80f909682d Core/Conditions: Optimizations part 2 removed unneeded code
(cherry picked from commit e5c1e7d71c3460a39317bacbc432adc3307c63ca)

Conflicts:
	src/server/game/Conditions/ConditionMgr.h
2016-01-11 01:52:10 -03:00
Shauren 5db2a8f3ee Core/Conditions: Optimizations part 1 - use containers more suited for their role
(cherry picked from commit 9fa938f3e0df2ca6b9ff4f800a5b41ba18cdd214)

Conflicts:
	src/server/game/Spells/SpellInfo.h
2016-01-11 01:52:06 -03:00
Shauren 315fdd1886 Core/Conditions: Type renaming
(cherry picked from commit 5e0cee85ddd67188365ead3f18206df088e1f0c7)

Conflicts:
	src/common/Common.h
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Loot/LootMgr.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
2016-01-11 01:52:03 -03:00
Shauren 1348b06a96 Core/Misc: Added a few stl header includes to Common.h
(cherry picked from commit 89b902b4e0d0016accd9540ca133519995a0b123)
(cherry picked from commit c5d36a3183)

Conflicts:
	src/common/Common.h
2016-01-11 01:51:59 -03:00
Shauren ed257a4ed4 Core/Auras: Fixed auras limited to a single target not being removed in all cases as expected
* Fixes possible assertion failure in Aura::UnregisterSingleTarget
Closes #15696
Ref #15668

(cherry picked from commit b808910a89822f741d35d4b90e6c4bcf101cd9ef)
2016-01-11 01:51:56 -03:00
Shauren af41a70fe8 Core/Commands: Refactored chat command script hook, fixes a crash when building with gcc 5
Closes #15616
Closes #15740

(cherry picked from commit 2d942ddcc528cc9fe718ebbd5903318fcbdab817)

Conflicts:
	src/server/game/Chat/Chat.cpp
	src/server/scripts/Commands/cs_battlenet_account.cpp
	src/server/scripts/Commands/cs_cast.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_go.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_mmaps.cpp
	src/server/scripts/Commands/cs_npc.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Commands/cs_ticket.cpp
2016-01-11 01:51:52 -03:00
Shauren 89928cbdf0 Core/Items: Fixed a possible crash with soulbound tradable items
Closes #15700

(cherry picked from commit 094f505e404b5a4e4846657031f89ac44626a1f8)
(cherry picked from commit cc685ac334)
2016-01-11 01:51:35 -03:00
Shauren 7a5a4cb726 Core/Players: Check if player can enter the instance during login before trying to add him to map
* Fixes name displaying as "Unknown"

(cherry picked from commit 45994a177c128dc83ea01b0697377f7b74b5c4ba)
(cherry picked from commit c7bad70e55)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
2016-01-11 01:51:32 -03:00
Shauren 4a07a95c18 Core/Corpses: Fixed a possible crash adding bones to grid
Closes #15808

(cherry picked from commit ec1583df67605b7253a34dc5f153cdad5b16969e)
(cherry picked from commit 910fb00130)
2016-01-11 01:51:14 -03:00
Shauren b215184cc0 Core/Corpses: Fixed a crash happening when a corpse is added to a grid that was not yet fully loaded
Closes #15684

(cherry picked from commit 8c9ea7782a)
2016-01-11 01:51:07 -03:00
Shauren ce7fc03930 Core/World: Store account id in CharacterInfo to reduce the amount of database queries
(cherry picked from commit aaaa1c34410c160c7b0382f5ecdb39fa01ba007c)
(cherry picked from commit 4a36850167)

Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
2016-01-11 01:51:04 -03:00
Shauren b7d37daa74 Core/Corpses: Fixed map crash happening during map unload when there are corpses inside
(cherry picked from commit 1d17475791)
2016-01-11 01:51:00 -03:00
Shauren fc9c587604 Core/Corpses: Fixed leaking bones
Ref #15765

(cherry picked from commit bd16520ecc91d827abae7f0447cc292fe9e843e9)

Conflicts:
	src/server/game/Entities/Corpse/Corpse.cpp
2016-01-11 01:50:56 -03:00
Shauren 1a553b780b Build fixes
Conflicts:
	src/server/game/Handlers/ItemHandler.cpp
2015-08-21 14:02:03 +01:00
Shauren 222eaccc51 Build fix for WheatyExceptionReport, c++ exceptions must not be thrown in SEH handlers 2015-08-16 18:08:03 +02:00
Shauren cdbd563157 Core/Logging: Refactored appender creation to allow using logging without mysql dependency in tools (future task)
Conflicts:
	src/server/bnetserver/Main.cpp
	src/server/worldserver/Main.cpp
2015-08-16 00:09:02 +01:00
Shauren 92b5b2e09a Travis build fix
(cherry picked from commit a7d9c4e720c6546089123e301e31af1583628e4e)
2015-07-27 01:13:29 +01:00
Shauren f03f5cc1f2 Buildsystem/MSVC: Enabled /bigobj for all x64 build types
(cherry picked from commit 52127197ec3ab3c77397867a9ab674fe6c0d8aeb)
2015-07-25 16:42:46 +01:00
Shauren 130878c1a5 Core/Collision: Removed direct GameObject references from collision project
(cherry picked from commit a029f97c8231f7be188663d63f95f34dd1b4f9e1)

Conflicts:
	src/server/collision/Models/GameObjectModel.cpp
2015-07-25 16:22:33 +01:00
Shauren caf808163d Misc: Removed tabs
(cherry picked from commit 4e83094354551b2b7efe40053cb57286b96c861b)
2015-07-24 12:05:14 +01:00
Shauren b4adf3f5dd Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176)

Conflicts:
	cmake/compiler/msvc/settings.cmake
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Garrison/Garrison.cpp
	src/server/game/Garrison/GarrisonMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Server/Packets/ChannelPackets.h
	src/server/game/Server/Packets/PartyPackets.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/scripts/Commands/cs_list.cpp
2015-07-24 11:51:48 +01:00
Shauren f880f2e778 Core/Threading: Clarified comment on ProducerConsumerQueue::WaitAndPop
(cherry picked from commit 08316552b5b176e8209d7e8f15c53053d049743d)
2015-07-19 00:48:17 +01:00
Shauren 23e4472d14 Core/PacketIO: Removed timezone adjustments from ReadPackedTime - player's session timezone offset should be used there, not server offset
(cherry picked from commit aa3b05c312626d903228aa7a768a069bce5fe526)
2015-07-06 22:25:34 +01:00
Shauren efad3a3123 Core/Spells: Implemented CAST_FLAG_IMMUNITY 2015-06-30 11:44:11 +02:00
Shauren 2538a84d0c Core/Units: Changed SPELL_AURA_MOD_MINIMUM_SPEED to always be applied, not only if under a slow aura (SPELL_AURA_MOD_MINIMUM_SPEED can set the minimum speed higher than base speed)
(cherry picked from commit d2142ac380863716ecea6f4aa44f7e556e44dfd9)
2015-06-26 01:26:22 +01:00
Shauren 5fe819462f Core/GameObject: Removed unneeded argument from GameObjectModel::Relocate and renamed it to UpdatePosition
(cherry picked from commit 6e9ab38fcc9d2859393e452ef8630ee420783e47)
2015-06-26 00:53:12 +01:00
Shauren d04c9d55ac Scripts/Zul'farrak: Fixed summoning Gahz'rilla
Fixes #5782 regression

(cherry picked from commit cec05ff07d1751649b6eecff07f23f52ca5443cd)
2015-06-19 17:29:09 +02:00
Shauren 9ecef15057 Core/Auth: Fixed authserver not shutting down correctly when started as windows service 2015-06-10 00:22:34 +02:00
Shauren ee4ace8c34 Core/Auth: Implemented starting authserver as a windows service 2015-06-06 13:04:31 +02:00
Shauren b239cadf41 Core/Misc: Removed some old unused enums
(cherry picked from commit 2f0c293266837eca217d2bff1df8b78ac6e12867)
2015-06-01 00:41:54 +01:00
Shauren 79dd72ae70 Buildsystem: Removed handling for -DPREFIX shortcut for -DCMAKE_INSTALL_PREFIX cmake option, it an internal cmake variable since version 3.2
(cherry picked from commit 1987d3187d1f14cf6dfcaf4f63861db806ad06cc)
2015-06-01 00:35:02 +01:00
Shauren 1f076a395f Scripts/Icecrown Citadel: Fixed Ice Tomb during phase 3 of Sindragosa encounter
(cherry picked from commit f85605b5f78f73c53a56874161155416b64ec078)
2015-05-21 00:03:11 +02:00
Shauren ba9e0de36d Core/Misc: Removed gcc specific packing pragma syntax - only unsupported (now) versions required it
(cherry picked from commit 4c7c2abf03b692e67a89d2ba0856aec1553c8ae1)

Conflicts:
	src/server/bnetserver/Packets/BitStream.h
	src/server/shared/Common.h
2015-05-19 21:47:48 +01:00
Shauren 8a013ba0fb Core/Misc: Moved Position to its own file
(cherry picked from commit 48ee1f003347910a48183f768501c1080fc40269)

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Spells/Spell.cpp
2015-05-19 21:44:39 +01:00
Shauren 8c61e51fe5 Core/Transports: Moved teleporting transports to Map::DelayedUpdate
(cherry picked from commit 5c5cb3e555da279b45ccff19b5ab4fc2656c75e2)
2015-05-19 11:12:14 +01:00
Shauren 970d7abf97 Core/Networking: Fixed possible msvc debug assertions in vector
(cherry picked from commit e4abbc09266d5878d0a03b04f3d72ea68549997f)
2015-05-19 11:12:03 +01:00
Shauren 88af3ffc2a Core/Socket: Removed unused synchronous read method
(cherry picked from commit 59e9bcf0bf44d89397f5a182e2ef21f7e3a3635d)

Conflicts:
	src/server/game/Server/WorldSocket.cpp
2015-04-29 00:06:19 +01:00
Shauren 8b07f1cd4d Core/GameObjects: Removed the possibility to spawn transports wih gm commands (such objects did not have any transport mechanics but could still cause crashes)
Closes #14542

(cherry picked from commit 149ff8da879a8286a01081d4ffb1f200a67ddefd)

Conflicts:
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/GameObject/GameObject.h
	src/server/game/Globals/ObjectMgr.cpp
2015-04-29 00:05:47 +01:00
Shauren be4b48ecaa Core/Corpses: Fixed corpses loaded from database not being visible after server restart 2015-04-27 17:25:27 +02:00
Shauren 2268f07a5f Buildsystem: Updated FindBoost macro, now finds versions 1.57 and 1.58 as well
(cherry picked from commit 5acc4b14aa81a5e9a946d11cfa9034d334ea7144)

Conflicts:
	cmake/macros/FindBoost.cmake

Signed-off-by: Naios <naios-dev@live.de>
2015-04-27 16:45:18 +02:00
Shauren ea214c223e Core/Misc: Ported relevant barbershop fixes from 4208c0d8396e10dc806939e1d17885d16ff7b84e 2015-04-24 18:40:19 +02:00
Shauren 96b7b7ced5 Build fix for GCC 4.7
(cherry picked from commit e7deae947c94eab04370b5bdaab059ac425d697d)
2015-04-05 13:57:45 +02:00
Shauren 62a3edb84a Core/Misc: Warning fixes
(cherry picked from commit cc4d79495f98006f77c68792b946a412f5e86714)

Partial cherry-picked.

Signed-off-by: Naios <naios-dev@live.de>
2015-04-05 01:20:11 +02:00
Shauren 548aa119ac Core/Networking: Fixed unsafe access to _worldSession member in WorldSocket
(cherry picked from commit bed88e0dd475af5b73cea03821f7fb7cb9ddce9d)

Core/Networking: Fixed deadlock in HandlePing if the client is about to be kicked for overspeed pings

(cherry picked from commit 3da0f7e40920b652d2222fa88dbb4b516d24725d)

Core/Networking: Cleanup CloseSocket calls from read failures in WorldSocket

(cherry picked from commit 18343a7309fbf53a3509749c0a5ca1f8ea273c57)

Conflicts:
	src/server/game/Server/WorldSocket.cpp

Ref #14474
2015-04-04 23:07:41 +01:00
Shauren 8bdd94f849 Core/DBUpdater: Fixed compile errors with boost 1.55 and VS 2013
(cherry picked from commit 495af75b7e21a2a84231b0540a6f2b9ed349ea58)
2015-03-22 00:35:05 +01:00
Shauren bba8555a29 Build fix 2015-03-18 11:47:30 +01:00
Shauren a23ad2b33c Core/Auras: Fixed possible crash in Aura::RefreshDuration - Aura::GetCaster can return NULL
(cherry picked from commit 8cd1c9514f336da3d3d9436be554fc80edb6e761)

Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
2015-03-15 12:57:08 +00:00
Shauren 8460c40c6f Core/DataStores: Corrected field names in SpellPowerEntry 2015-03-08 13:16:30 +01:00
Shauren e52b46abba Core/Crypto: Fixed output of BigNumber::AsByteArray when generated array is shorter than requested size 2015-03-01 14:16:16 +01:00
Shauren 869bc4e0f7 Buildsystem/Genrev: Fixed revision generator not reading existing cmake cache variables 2015-02-24 18:51:46 +01:00
Shauren 6cc38ad7d2 Core/Spells: Restored totem category check
Revert "Core/Totems: In cata totem items are no longer needed"

This reverts commit 45e0cae7be

(cherry picked from commit ea9eccae8596d440c372b0d9709d4def4b46e648)

Conflicts:
	src/server/game/Entities/Item/ItemPrototype.h
2015-02-22 06:06:34 +00:00
Shauren a46d201723 Core/Spells: Renamed SPELL_ATTR4_TRIGGERED to SPELL_ATTR4_CAN_CAST_WHILE_CASTING and adjusted trigger flags accordingly
(cherry picked from commit 6d70acbbd66959f7b6896a19ce3f2a25ccf94f2e)

Conflicts:
	src/server/game/Spells/Spell.cpp
2015-01-31 20:16:21 +00:00
Shauren 9ee820d83d Core/Players: Fixed loading and saving skill data PK violations
(cherry picked from commit 2dfd1594cd3cc7fdba4131d2e825885cac2bcc17)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
2015-01-31 20:14:15 +00:00
Shauren 5781119c4b Core/Entities: Fixed data sent in movement packets - time3 in transport block is actually the id of a vehicle we are passenger on 2014-11-01 00:24:10 +01:00
Shauren 58a33a8e7b Core/Corpses: Fixed loading corpse guid during server startup 2014-10-24 18:53:07 +02:00
Shauren 4a0be2bffc Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Spells/SpellMgr.cpp
2014-10-18 16:00:20 +02:00
Shauren c238e8faff Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Handlers/GroupHandler.cpp
2014-10-18 15:54:30 +02:00
Shauren 1d1b3269c1 Buildsystem/CMake: Fixed FindZMQ macro on x86 Windows 2014-10-18 14:57:49 +02:00
Shauren 55e7879aec Buildsystem/CMake: Fixed FindZMQ macro on x86 Windows 2014-10-18 14:05:55 +02:00
Shauren 130bceac9d CI/Travis: Use a different ZeroMQ package for travis only 2014-10-18 12:04:22 +02:00
Shauren 552b64f1cb CI/Travis: Added libzmq-dev to install list 2014-10-18 11:58:21 +02:00
Shauren d2973fce98 Merge pull request #13352 from ShinDarth/4.3.4
Core/LootMgr:  Restore Build
2014-10-18 11:56:25 +02:00
Shauren 69a17346d4 More build fixes, everyone loves pch 2014-10-18 00:26:41 +02:00
Shauren 863eac9c1a Fixed nopch build 2014-10-18 00:01:00 +02:00
Shauren efcde65cf2 Dep/zmqpp: Build fix for ZMQ version 2.2.0 2014-10-17 23:40:17 +02:00
Shauren f773a9e053 Core: Implemented IPC (Inter-process communication) between worldserver and bnetserver using ZeroMQ library.
* Implemented ToonReady and ToonLoggedOut battle.net packets
2014-10-17 22:48:06 +02:00
Shauren cc27497ea7 Battle.net: Removed not implemented comment from stream items opcodes 2014-10-14 16:53:44 +02:00
Shauren 1ef31ba752 Battle.net: Implemented cache stream items 2014-10-13 17:22:24 +02:00
Shauren cf521de9cb Battle.net/Packets: Added packet name mapping for logging 2014-10-12 20:58:25 +02:00
Shauren 5f2252e863 Core/Authserver: Removed battle.net authresult enum from authserver 2014-10-12 18:59:01 +02:00
Shauren 7679ecd7b3 Core/Battle.net: Improved logging - use separate filters instead of throwing everything to one logger 2014-10-12 15:34:01 +02:00
Shauren c2a39ce36a Core/PacketIO: Let packets that have a handler in array through to worldsession update 2014-10-12 15:32:25 +02:00
Shauren 0f83c6ac32 Build fix 2014-10-11 23:49:31 +02:00
Shauren 665b1daab7 Core/PacketIO: Removed PacketFilter::DropHighBytes 2014-10-11 23:40:51 +02:00
Shauren cbabfe9920 Core/Battle.net: Handle ConnectionClosing 2014-10-11 22:45:01 +02:00
Shauren 26e4b67e85 Core/Battle.net: Removed remaining authserver references 2014-10-11 15:16:06 +02:00
Shauren 56cf7ff2a8 Core/Battle.net: Implemented updating realm list after initial login 2014-10-11 15:13:30 +02:00
Shauren 00603772df Core/Battle.net: Added missing includes and changed default config file name 2014-10-10 23:48:01 +02:00
Shauren cb06ac47b3 Removed a file that somehow came back - I blame magic. 2014-10-10 23:28:34 +02:00
Shauren f52e921521 Core/Config: Removed bnet port from authserver and authserver port from bnet config giles 2014-10-10 23:22:11 +02:00
Shauren a04393f554 Core/Auth: Moved battle.net handling to separate project 2014-10-10 23:19:40 +02:00
Shauren 67f9d916cb Build: Fixed game & collision depending on each other for linking 2014-10-09 23:01:31 +02:00
Shauren 2e455eee86 Core/Entities: Removed the possibility to teleport non-player objects to different maps 2014-10-08 20:24:55 +02:00
Shauren b781a4dc33 Core/Logging: Replaced direct calls to GetCounter() in logs with ToString() 2014-10-08 17:59:27 +02:00
Shauren b8b7b503ba Core/Authserver: Added battle.net chat channel opcode definitions 2014-10-05 17:57:01 +02:00
Shauren 238b194709 Core/Authserver: Added battle.net profile channel opcode definitions 2014-10-05 16:36:19 +02:00
Shauren dd26efa40b Core/Authserver: Refactored handling battle.net client packets 2014-10-05 16:21:27 +02:00
Shauren 2494346288 Core/Authserver: Added battle.net cache channel opcode definitions 2014-10-05 13:05:36 +02:00
Shauren 4beef458f8 Core/Authserver: Added battle.net achievement channel opcode definitions 2014-10-05 12:39:12 +02:00
Shauren 92d22ee3f9 Core/Authserver: Added battle.net support channel opcode definitions 2014-10-05 12:24:38 +02:00
Shauren f4a62a178d Core/Authserver: Added battle.net presence channel opcode definitions 2014-10-05 12:17:17 +02:00
Shauren b4a6aa1de0 Core/Authserver: Added friend related battle.net opcode definitions 2014-10-05 04:09:06 +02:00
Shauren 8427e879f1 Core/Authserver
* Reorganized packet classes, moved each channel to separate namespace and file
* Added all opcode names for channels: auth, connection and wowrealm
* Documented more fields in LogonResponse
2014-10-04 15:45:33 +02:00
Shauren 04b6f9111a Fixed ==25829== Thread #1: pthread_cond_{signal,broadcast}: dubious: associated lock is not held by any thread
==25829== at 0x4C2A1D5: pthread_cond_broadcast_WRK (hg_intercepts.c:891)
==25829== by 0x654A758: std::condition_variable::notify_all() (in /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.17)
==25829== by 0x132305A: ProducerConsumerQueue<SQLOperation*>::Cancel() (ProducerConsumerQueue.h:100)
==25829== by 0x13229A7: DatabaseWorkerPool<WorldDatabaseConnection>::~DatabaseWorkerPool() (DatabaseWorkerPool.h:70)
==25829== by 0x6C6CB21: __run_exit_handlers (exit.c:78)
==25829== by 0x6C6CB74: exit (exit.c:100)
==25829== by 0x6C54EF3: (below main) (libc-start.c:276)
2014-10-02 20:09:08 +02:00
Shauren 46acf64d0f Core/GameObjects: Fixed possible crashes if transport objects don't have entries in TransportAnimation.dbc 2014-09-30 22:48:04 +02:00
Shauren 56ccbd97d1 Fixed c/p mistake 2014-09-30 16:59:42 +02:00