I was taught to always tip on the full price of the meal (this includes price before discounts, coupons, etc.). It sounds like your server did the right thing by you so I would have no problem tipping the full amount. Just because a plate was sent back, doesn't mean that the server didn't do...