Commit Graph
23058 Commits
Author SHA1 Message Date
Subv 18924654a3 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4_phases 2014-06-01 22:43:24 -05:00
Subv 48ec2df81f Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4
Put here for peer review.
2014-06-01 22:27:29 -05:00
Kinzcool 289a5c4318 DB/Phases: Added PhaseId & PhaseGroup fields for coming phasing changes 2014-06-01 22:13:08 -04:00
Kinzcool edced30576 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-06-01 13:42:07 -04:00
Gacko 26370223a0 Script/Shadowmoon Valley: Remove hack in npc_shadowmoon_tuber_node.
This script will be converted to SAI (if possible) later.
2014-06-01 19:39:57 +02:00
Gacko 8ef34535a4 Scripts: Remove unused variables (kept as comment) 2014-06-01 19:34:34 +02:00
Shauren 9fcd607e78 Core/Misc: Added utility method for checking is two sorted containers have a common element 2014-06-01 19:20:49 +02:00
jackpoz 282a7cad7d Core/Misc: Code cleanup
Remove old unused opcode handler WorldSession::HandlePageQuerySkippedOpcode() for CMSG_PAGE_TEXT_QUERY since it's already handled by WorldSession::HandlePageTextQueryOpcode()
2014-06-01 16:15:27 +02:00
jackpoz 70bd70080d Core/QuestPOI: Mitigate possible DoS with CMSG_QUEST_POI_QUERY
Avoid sending POIs for same quest if the client somehow sent duplicates quest id in same CMSG_QUEST_POI_QUERY packet. This also reduce the effects of possible DoS and increases the difficulty to cause it.
Fix a typo which caused no quest POIs to be sent at all if the client queried data for 25 quests.
2014-06-01 13:33:46 +02:00
Subv 6bc62d730e Core/Auras: Fixed build and crash from previous commit. 2014-05-31 22:43:11 -05:00
Subv 82ff42b081 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-31 20:07:19 -05:00
Subv 0e2bca9153 Core/Auras: Implemented SPELL_AURA_PHASE_GROUP.
ToDo: Use phaseids instead of phasemasks
2014-05-31 20:05:48 -05:00
jackpoz 6a54ed88c6 Core/NetworkIO: Fix performance loss when handling bad packets
Revert f9cb4280bd which retrieved the callstack each time a ByteBufferPositionException or a ByteBufferSourceException occurred, for example with bad packet structure.
2014-06-01 00:29:33 +02:00
Filip 3ceabf962d Martek the Exiled's prerequisite quests
Fix by @untaught
2014-05-30 22:11:03 +02:00
Warpten 7b49038454 Merge pull request #12171 from Ankso/player_update_zone
Core/Players: Update the player's zone and area only after the player's position is updated server-side.
2014-05-30 19:53:47 +02:00
Ankso ab62fe30bc Core/Players: Update the player's zone and area after update the player's
position server side.
2014-05-30 17:18:52 +02:00
Vincent-Michael d65b5d4317 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-29 21:36:10 +02:00
Vincent-Michael c893c3ce57 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldSession.cpp
2014-05-29 21:35:55 +02:00
jackpoz 8d539ee6c0 Merge pull request #12162 from Trisjdc/aura_split_damage_breaking
Core/Spells: Break 'Fear' and similar auras on damage sharing of SPELL_AURA_SPLIT_DAMAGE_PCT
2014-05-29 21:21:39 +02:00
jackpoz 65917f52ea CoreCore/NetworkIO: Fix disconnect when canceling character creation
Remove the filter on CMSG_CHAR_ENUM added in 59b4c34924 since the same opcode is already throttled in the new improved system. DoS attacks using this opcode are still mitigated with same effect of before.
Fixes #10915
2014-05-29 21:11:41 +02:00
jackpoz b92e1046be Merge pull request #12007 from Trisjdc/spell_pushback
Core/Spells: Define and implement SPELL_ATTR7_NO_PUSHBACK_ON_DAMAGE
2014-05-29 19:54:39 +02:00
jackpoz fabceddacb Merge pull request #12160 from Trisjdc/petai
Core/PetAI: Pin should not be interrupted if the victim has a breakable aura
2014-05-29 19:45:48 +02:00
jackpoz 1b47f3270e Core/NetworkIO: Adjust more packet throttling values
Adjust more packet throttling values and add Player name to log to help investigate false positives.
2014-05-29 19:43:09 +02:00
Trisjdc 1301ad800b Core/Spells: Break 'Fear' and similar auras on damage sharing of SPELL_AURA_SPLIT_DAMAGE_PCT 2014-05-28 22:22:54 +01:00
Trisjdc 9f50dd3bd6 Core/PetAI: Pin should not be interrupted if the victim has a breakable aura 2014-05-28 21:52:01 +01:00
jackpoz f312b86941 Core/NetworkIO: Adjust more packet throttling values 2014-05-27 21:19:19 +02:00
joschiwald acc9f1575a Merge pull request #12146 from Trisjdc/spell_hymn
Core/Spells: Missing target conditions for Divine Hymn/Hymn of Hope's second effect
2014-05-27 02:32:49 +02:00
Trisjdc 0e32789cd2 Core/Spells: Missing target conditions for Divine Hymn/Hymn of Hope's second effect 2014-05-26 20:42:53 +01:00
jackpoz b5b64a2cdd Core/NetworkIO: Adjust more packet throttling values 2014-05-26 20:13:04 +02:00
Michael 37e3f65f7f Core: Fix fail in 672b8c6e13 2014-05-25 22:26:46 +02:00
Michael 672b8c6e13 Core: Fix merge fail 2014-05-25 22:25:26 +02:00
Michael 9df4db15a7 Core: Fix warning 2014-05-25 22:21:01 +02:00
Michael 15efe08a60 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Reputation/ReputationMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Weather/Weather.cpp
	src/server/game/Weather/WeatherMgr.cpp
	src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
	src/server/scripts/Spells/spell_hunter.cpp
2014-05-25 21:52:27 +02:00
jackpoz c06dc7d37a Core/NetworkIO: Adjust more packet throttling values
Adjust some more packet throttling values.
Revert b35f831f2b since it's no longer needed.
Modify the AntiDoS log to specify in a more readable way which opcode triggered the system and how many packets have been received.
2014-05-25 20:14:59 +02:00
Sebastian Valle Herrera c06a263f96 Merge pull request #12129 from Trisjdc/go_collision
Core/Collision: Solve collision issues with non spawned GOs
2014-05-25 11:15:17 -05:00
Sebastian Valle Herrera 1a48967cdf Merge pull request #12130 from Trisjdc/go_collision_2
Core/Collision: Solve collision issues with GAMEOBJECT_TYPE_DOOR GOs
Closes #6303
Closes #7628
2014-05-25 11:12:06 -05:00
Shauren d6414bd9a5 Merge pull request #12131 from Trisjdc/resting
Core/Players: Implement resting for areas with AREA_FLAG_REST_ZONE_ALLIANCE or AREA_FLAG_REST_ZONE_HORDE
2014-05-25 16:17:58 +02:00
Trisjdc fd753a6105 Core/Players: Implement resting for areas with AREA_FLAG_REST_ZONE_ALLIANCE or AREA_FLAG_REST_ZONE_HORDE 2014-05-25 15:05:15 +01:00
jackpoz b4327bfc69 Core/Misc: Fix no-pch build 2014-05-25 15:48:06 +02:00
jackpoz 2f0f8f8018 Core/NetworkIO: Adjust packet throttling values
Adjust packet throttling values to avoid false positive. In case you are experiencing random kicks change the PacketSpoof.Policy setting in worldserver configs and report which packets are triggering the anti-dos system.
2014-05-25 15:26:49 +02:00
jackpoz 5e66253de2 Core/Misc: Throw an exception if client sends invalid float/double data
Throw a ByteBufferException if client sends 1.#INF0000, 1.#QNAN000, 1.#IND0000 or other invalid float/double values.
Handle this invalid values in StaticMapTree::isInLineOfSight() to avoid triggering an assert.
Fixes #12126
2014-05-25 15:18:55 +02:00
Trisjdc 0ce6824a86 Core/Collision: Solve collision issues with GAMEOBJECT_TYPE_DOOR GOs 2014-05-25 11:35:51 +01:00
Trisjdc 45fcc2ff9d Core/Collision: Solve collision issues with non spawned GOs 2014-05-25 11:34:26 +01:00
jackpoz 01b33a6772 Merge pull request #12084 from Trisjdc/pet_combat_2
Core/Spells: Players with active pets count as if they were players in combat against spells with SPELL_ATTR1_CANT_TARGET_IN_COMBAT
2014-05-25 11:25:04 +02:00
jackpoz c4497e26f3 Merge pull request #12119 from Trisjdc/sniper_training
Core/Spells: Sniper Training should refresh every 6 seconds if all conditions are met
2014-05-25 00:35:35 +02:00
jackpoz 1f78ff541a Merge pull request #12120 from Trisjdc/aura_exploit
Core/Auras: Solve exploit involving SPELL_AURA_MOD_DAMAGE_DONE and weapon swapping
2014-05-25 00:32:37 +02:00
jackpoz a4ba54fbdb Core/NetworkIO: Improve packet spam solution
Implement an improved packet Anti-DoS by counting how many times the same opcode has been sent in the last second and applying the policy specified in the configs if the amount of packets exceeds a reasonable amount.
Credits to the original author who decided to share this with TrinityCore team.
2014-05-24 22:34:06 +02:00
Trisjdc 51b782a91e Core/Auras: Solve exploit involving SPELL_AURA_MOD_DAMAGE_DONE and weapon swapping 2014-05-24 19:01:05 +01:00
Trisjdc ea1c4a355c Core/Spells: Sniper Training should refresh every 6 seconds if all conditions are met 2014-05-24 18:57:26 +01:00
jackpoz f091713086 Core/Misc: Fix typo
Fix typos about the word "Resurrect"
2014-05-24 18:25:53 +02:00