Did Thornclaw die before Long Shadows?

In Warrior Cats Power Of 3: Long Shadows I read that Thornclaw caught Greencough. Well for some reason I thought Thornclaw died in Warriors the New Prophecy Twilight (Because a Badger slung him and he splat on the wall I think is what I remembered.) I also thought that I read that Thornclaw died in Twilight somewhere. Please Help Me! :)