One Piece: Baron Omatsuri & The Secret Island!

Was this the one about the plants and Luffy's and the crews loyalty to each other even on the verge of death? It was quite unexpected that the guy killed the Baron with the arrow and wasn't Luffy. A bit disappointed but awesome nonetheless =)