josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

Browse Source 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
This commit is contained in:
QAston
2011-07-13 17:22:04 +02:00
parent 20e8c25b48 e9e50c4937
commit 5b1d170272
4 changed files with 716 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+498 -513
View File
File diff suppressed because it is too large Load Diff
src/server/game/Globals/ObjectAccessor.cpp
+3
View File
@@ -200,7 +200,10 @@ void ObjectAccessor::RemoveCorpse(Corpse* corpse)
ASSERT(corpse && corpse->GetType() != CORPSE_BONES);
if (corpse->FindMap())
{
corpse->DestroyForNearbyPlayers();
corpse->FindMap()->Remove(corpse, false);
}
else
corpse->RemoveFromWorld();
src/server/game/Grids/Notifiers/GridNotifiers.h
+4 -5
View File
@@ -824,20 +824,19 @@ namespace Trinity
class AnyUnfriendlyAttackableVisibleUnitInObjectRangeCheck
{
public:
AnyUnfriendlyAttackableVisibleUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range)
: i_obj(obj), i_funit(funit), i_range(range) {}
AnyUnfriendlyAttackableVisibleUnitInObjectRangeCheck(Unit const* funit, float range)
: i_funit(funit), i_range(range) {}
bool operator()(Unit* u)
bool operator()(const Unit* u)
{
return u->isAlive()
&& i_obj->IsWithinDistInMap(u, i_range)
&& i_funit->IsWithinDistInMap(u, i_range)
&& !i_funit->IsFriendlyTo(u)
&& i_funit->canAttack(u)
&& u->GetCreatureType() != CREATURE_TYPE_CRITTER
&& i_funit->canSeeOrDetect(u);
}
private:
WorldObject const* i_obj;
Unit const* i_funit;
float i_range;
};
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+1 -1
View File
@@ -5686,7 +5686,7 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
Trinity::AnyUnfriendlyAttackableVisibleUnitInObjectRangeCheck u_check(target, target, radius);
Trinity::AnyUnfriendlyAttackableVisibleUnitInObjectRangeCheck u_check(target, radius);
Trinity::UnitListSearcher<Trinity::AnyUnfriendlyAttackableVisibleUnitInObjectRangeCheck> checker(target, targets, u_check);
TypeContainerVisitor<Trinity::UnitListSearcher<Trinity::AnyUnfriendlyAttackableVisibleUnitInObjectRangeCheck>, GridTypeMapContainer > grid_object_checker(checker);