Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,046 Commits 4 Branches 146 Tags
48ec2df81fa8f88cd32d7a79b587603aedbd89e0
Commit Graph

23046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Discover-
8f42dd3fab Merge pull request #12111 from MitchesD/commands 
Scripts/Commands: added option to show InhabitType in .npc info command
 2014-05-24 00:45:06 +02:00
MitchesD
007e903753 Scripts/Commands: added option to show InhabitType in .npc info command 2014-05-23 20:51:22 +02:00
Discover-
80daaf8d43 Core/SAI: SMART_EVENT_IC_LOS is now called when movement in LOS was made while the creature was in combat 2014-05-23 17:11:37 +02:00
joschiwald
3c97735056 Scripts/PoS: fixed rimefang icy blast 
Closes #632
 2014-05-23 16:16:31 +02:00
Vincent-Michael
49a17c6282 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2014-05-22 20:53:13 +02:00
Warpten
fa31b161cc Merge pull request #12102 from Trisjdc/achievements 
Core/Achievements: Fixed ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS in case killed creature has a loot recipient (Credit would be granted to loot recipient rather than killing blow lander)
 2014-05-22 20:04:27 +02:00
Shauren
8ddb112569 Merge pull request #12107 from Trisjdc/nitro_jump 
Core/Spells: Nitro Boost should not fail in dungeon maps
 2014-05-22 17:28:48 +02:00
Trisjdc
4793f20506 Core/Spells: Nitro Boost should not fail in dungeon maps 2014-05-22 14:40:21 +01:00
Trisjdc
4d3156e0b8 Core/Achievements: Fix ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS 2014-05-21 15:10:15 +01:00
jackpoz
1083dbb993 Core/Misc: Remove Unit::Get* wrappers for ObjectAccessor::Get* 2014-05-20 21:21:33 +02:00
jackpoz
d36ecbf4a3 Merge pull request #12076 from Trisjdc/even_more_sai 
Core/SAI: Clear UNIT_STATE_EVADE immediately if we're about to follow a target on EnterEvadeMode
 2014-05-19 22:00:48 +02:00
jackpoz
0166d9bf89 Merge pull request #12083 from Trisjdc/pet_combat 
Core/PetAI: Pet's owner should NOT enter combat when the pet attacks/enters combat
 2014-05-19 21:44:15 +02:00