Merge branch 'master' into 303

Conflicts:
	contrib/extractor/System.cpp
	contrib/extractor/ad.exe
	src/game/WorldSocket.cpp
This commit is contained in:
tomrus88 2008-11-06 15:50:47 +03:00
commit 78ec66babc
78 changed files with 510 additions and 752 deletions

View file

@ -372,7 +372,7 @@ void WorldSession::HandleSpiritHealerActivateOpcode( WorldPacket & recv_data )
void WorldSession::SendSpiritResurrect()
{
_player->ResurrectPlayer(0.5f,false, true);
_player->ResurrectPlayer(0.5f, true);
_player->DurabilityLossAll(0.25f,true);