Fixes for blocks not being painted

PaintSame<Something> needed to be updated for origin changes