- Don't fire EntityZapEvent twice (#6830)