Remove pointless if statement.
Fixed timer reset after mapchange.
I forgot to add the flag.