Fix flowers attempt 2

also fix walking through double flowers
this should be release as build 21