What do you mean by right collision detection?
Also I have been working on this, but i made a huge mess of the code while trying to fix the various lake generation bugs, and i'm trying to fix a bug in which the game stops recognizing that there a variables for the inventory and crashes on start O-o