Harry Potter MOVIE question Draco Dumbledore?

In the half blood price, the movie, did Draco disarm Dumbledore? I dont remember, and if they didnt include that, HPDHP2 is going to be really confusing, or really differnt than the book. Harry has to get the Elder wand, i mean wtf, I must be wrong and they must have included that bit in the half blood prince. CORRECT ME!