With a separate wall class now, why not just entity instanceof Wall?