Tidy code, do FindBugs suggestions
Add BEACON to condensables
Make sure the player is still in a TARDIS world when updating blocks