Revert Pan's room changes to see if this fixes battles.