[ChaosSlayer]

few corrections:

the line # for first chunk of code is line 2475 in client.cpp

also - i left out } at the end of my replacement code